diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2013-03-21 11:59:07 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2013-03-21 11:59:07 +0400 |
commit | 3c1ce85692d68054a476e6e27549b3f8ca0f4119 (patch) | |
tree | 22f69b87d72ab4b7580f8b5b341d2daa62d7a3cd /pkgs | |
parent | a9ec58c8b370468c132128ddc8e516d5870d1c26 (diff) | |
download | nixlib-3c1ce85692d68054a476e6e27549b3f8ca0f4119.tar nixlib-3c1ce85692d68054a476e6e27549b3f8ca0f4119.tar.gz nixlib-3c1ce85692d68054a476e6e27549b3f8ca0f4119.tar.bz2 nixlib-3c1ce85692d68054a476e6e27549b3f8ca0f4119.tar.lz nixlib-3c1ce85692d68054a476e6e27549b3f8ca0f4119.tar.xz nixlib-3c1ce85692d68054a476e6e27549b3f8ca0f4119.tar.zst nixlib-3c1ce85692d68054a476e6e27549b3f8ca0f4119.zip |
Fix ZBar build by passing it gtk2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index d5cea08f3df9..83c9b1577935 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l - , qt4, lzma + , qt4, lzma, gtk2 , ...}: builderDefsPackage (a : diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad90b95abda..57ffb694eb6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1872,7 +1872,11 @@ let youtubeDL = callPackage ../tools/misc/youtube-dl { inherit (haskellPackages) pandoc; }; - zbar = callPackage ../tools/graphics/zbar {}; + zbar = callPackage ../tools/graphics/zbar { + pygtk = lib.overrideDerivation pygtk (x: { + gtk = gtk2; + }); + }; zdelta = callPackage ../tools/compression/zdelta { }; |