diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-26 10:28:07 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-26 11:10:50 +0200 |
| commit | ee510f201db8e12081c3b91606590bbb928c71c2 (patch) | |
| tree | 1fc67a09236ed91fdb94d23f8e3a11c8926797e4 | |
| parent | 804de7d8208376a9ba7d3c77d34dd043bc953803 (diff) | |
| download | nixlib-ee510f201db8e12081c3b91606590bbb928c71c2.tar nixlib-ee510f201db8e12081c3b91606590bbb928c71c2.tar.gz nixlib-ee510f201db8e12081c3b91606590bbb928c71c2.tar.bz2 nixlib-ee510f201db8e12081c3b91606590bbb928c71c2.tar.lz nixlib-ee510f201db8e12081c3b91606590bbb928c71c2.tar.xz nixlib-ee510f201db8e12081c3b91606590bbb928c71c2.tar.zst nixlib-ee510f201db8e12081c3b91606590bbb928c71c2.zip | |
zbar: do not use top-level python packages
| -rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 9a181e7d087d..66f61d9a459e 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, imagemagickBig, pkgconfig, python, pygtk, perl +{ stdenv, fetchurl, imagemagickBig, pkgconfig, pythonPackages, perl , libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) pygtk python; +in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "zbar"; version = "0.10"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5806e9f6129f..d0757a74c07b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4285,11 +4285,7 @@ in zbackup = callPackage ../tools/backup/zbackup {}; - zbar = callPackage ../tools/graphics/zbar { - pygtk = lib.overrideDerivation pygtk (x: { - gtk = gtk2; - }); - }; + zbar = callPackage ../tools/graphics/zbar { }; zdelta = callPackage ../tools/compression/zdelta { }; |