diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-12-23 08:42:30 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-12-23 19:37:21 +0100 |
| commit | 81a2b58c393a49fb16581567ae8deddc25e5e2f1 (patch) | |
| tree | 8f184eaca6c9bfcb13db196a47c9b0b28c35c15a /pkgs/desktops | |
| parent | 49f53f63f5b5ae771822f05f80d150068cb57284 (diff) | |
| download | nixpkgs-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar nixpkgs-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.gz nixpkgs-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.bz2 nixpkgs-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.lz nixpkgs-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.xz nixpkgs-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.zst nixpkgs-81a2b58c393a49fb16581567ae8deddc25e5e2f1.zip | |
nixpkgs: remove redundant attribute `sip`
Because: 1. It is a mere alias of `pythonPackages.sip` 2. It is usually not needed since propagated by `pyqt4` 3. It makes it easy to have a packages depend on two different versions of sip
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.14/applications/kate.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.14/kdebindings/pykde4.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix index e7a6476dd6d..2440d73e7e8 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, sip, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, python, pykde4}: kde { - buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ]; + buildInputs = [ kdelibs kactivities qjson pyqt4 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 f86412147d3..191b96380e6 100644 --- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, +{ kde, kdelibs, python, pyqt4, kdepimlibs, shared_desktop_ontologies, polkit_qt4, boost, lndir, pkgconfig }: let pydir = "lib/python${python.majorVersion}"; in @@ -14,7 +14,7 @@ kde { nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pyqt4 sip ]; + propagatedBuildInputs = [ pyqt4 ]; preConfigure = '' |