diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-14 12:37:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-14 12:38:01 +0200 |
| commit | 6842a24b21dcc49a5ed485f6ffde14e69e430adb (patch) | |
| tree | 4c56223bd954bcf84d41d81227b3d627c2160c8f /pkgs/desktops/kde-4.14 | |
| parent | 4b2120f5b895e133b3c991bd01ba28e6d1698311 (diff) | |
| download | nixlib-6842a24b21dcc49a5ed485f6ffde14e69e430adb.tar nixlib-6842a24b21dcc49a5ed485f6ffde14e69e430adb.tar.gz nixlib-6842a24b21dcc49a5ed485f6ffde14e69e430adb.tar.bz2 nixlib-6842a24b21dcc49a5ed485f6ffde14e69e430adb.tar.lz nixlib-6842a24b21dcc49a5ed485f6ffde14e69e430adb.tar.xz nixlib-6842a24b21dcc49a5ed485f6ffde14e69e430adb.tar.zst nixlib-6842a24b21dcc49a5ed485f6ffde14e69e430adb.zip | |
Remove top-level pyqt4
See #11567.
Diffstat (limited to 'pkgs/desktops/kde-4.14')
| -rw-r--r-- | pkgs/desktops/kde-4.14/applications/kate.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.14/kdebindings/pykde4.nix | 9 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.14/kdeutils/print-manager.nix | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix index 2440d73e7e8e..ddeb89063e50 100644 --- a/pkgs/desktops/kde-4.14/applications/kate.nix +++ b/pkgs/desktops/kde-4.14/applications/kate.nix @@ -1,8 +1,8 @@ -{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pythonPackages, pykde4}: kde { - buildInputs = [ kdelibs kactivities qjson pyqt4 python pykde4 ]; + buildInputs = [ kdelibs kactivities qjson pythonPackages.pyqt4 pythonPackages.python pykde4 ]; meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix index 5a911d4b3ea3..48d457e10a7f 100644 --- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix @@ -1,9 +1,10 @@ -{ kde, kdelibs, python, pyqt4, kdepimlibs, shared_desktop_ontologies, +{ kde, kdelibs, pythonPackages, kdepimlibs, shared_desktop_ontologies, polkit_qt4, boost, lndir, pkgconfig }: -let pydir = "lib/python${python.majorVersion}"; in - -kde { +let + inherit (pythonPackages) python pyqt4; + pydir = "lib/python${python.majorVersion}"; +in kde { patches = [ ./pykde4-gcc-5.patch ]; diff --git a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix index d12c261a728d..bc4938103b12 100644 --- a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix +++ b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix @@ -1,5 +1,5 @@ { kde, kdelibs -, pythonPackages, cups, pyqt4, pykde4, pycups, system-config-printer }: +, pythonPackages, cups, pykde4, pycups, system-config-printer }: let s_c_p = system-config-printer.override { withGUI = false; }; in @@ -7,7 +7,7 @@ kde rec { buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython ] ++ pythonPath; - pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ]; + pythonPath = [ cups pythonPackages.pyqt4 pykde4 pycups s_c_p ]; # system-config-printer supplies some D-Bus policy that we need. propagatedUserEnvPkgs = [ s_c_p ]; |