From a1924fca1230d7e59cf0cb9a817d0ca8d3591f90 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 17:26:51 +0300 Subject: [PATCH] KDE4.10: Fix PyKDE4 build I accidentally left in a broken state. Remove notice from kajongg because it compiles fine now. --- pkgs/desktops/kde-4.10/kdebindings/pykde4.nix | 16 +++++++++------- pkgs/desktops/kde-4.10/kdegames/kajongg.nix | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix index baa5e807236c..65a7c7ffe7e1 100644 --- a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix @@ -1,19 +1,21 @@ { kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, - boost, lndir }: + nepomuk_core, polkit_qt_1, boost, lndir, pkgconfig }: let pydir = "lib/python${python.majorVersion}"; in kde { -#todo: doesn't build - buildInputs = [ python kdepimlibs -# shared_desktop_ontologies boost -]; + + # todo: polkit isn't found by the build system + + buildInputs = [ + python kdepimlibs shared_desktop_ontologies + boost nepomuk_core polkit_qt_1 pkgconfig + ]; propagatedBuildInputs = [ pyqt4 sip ]; # patches = [ ./pykde4-hardcode-lib-python.patch ]; - - cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON "; +# cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON "; preConfigure = '' diff --git a/pkgs/desktops/kde-4.10/kdegames/kajongg.nix b/pkgs/desktops/kde-4.10/kdegames/kajongg.nix index 609850c3abfb..9a6f5e836955 100644 --- a/pkgs/desktops/kde-4.10/kdegames/kajongg.nix +++ b/pkgs/desktops/kde-4.10/kdegames/kajongg.nix @@ -1,6 +1,6 @@ { kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }: kde rec { -#todo: doesn't build + buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath; pythonPath = [ pythonPackages.twisted pykde4 ];