summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2014-12-23 08:42:30 +0100
committerVincent Laporte <Vincent.Laporte@gmail.com>2014-12-23 19:37:21 +0100
commit81a2b58c393a49fb16581567ae8deddc25e5e2f1 (patch)
tree8f184eaca6c9bfcb13db196a47c9b0b28c35c15a /pkgs/development/python-modules
parent49f53f63f5b5ae771822f05f80d150068cb57284 (diff)
downloadnixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.gz
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.bz2
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.lz
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.xz
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.zst
nixlib-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/development/python-modules')
-rw-r--r--pkgs/development/python-modules/pyqt/4.x.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 92a5fd2dc07f..c85b959a1200 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
+{ stdenv, fetchurl, python, pythonPackages, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
 
 let version = "4.10.2"; # kde410.pykde4 doesn't build with 4.10.3
 in
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ python pkgconfig makeWrapper qt4 lndir ];
 
-  propagatedBuildInputs = [ sip ];
+  propagatedBuildInputs = [ pythonPackages.sip ];
 
   postInstall = ''
     for i in $out/bin/*; do