From 3c1ce85692d68054a476e6e27549b3f8ca0f4119 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 21 Mar 2013 11:59:07 +0400 Subject: [PATCH] Fix ZBar build by passing it gtk2 --- pkgs/tools/graphics/zbar/default.nix | 2 +- 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 { };