JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zbar: do not use top-level python packages

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-09-26 10:28:07 +02:00
parent 804de7d820
commit ee510f201d
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/graphics/zbar/default.nix
View File

@ -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";

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };