From ef3a71007a5bfb3db76dac1a92c076f96083ec8a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Mar 2012 12:21:09 +0000 Subject: [PATCH] Forgotten part of xsane: Use libpng specified, not the one propagated svn path=/nixpkgs/trunk/; revision=32822 --- pkgs/misc/xsane/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/xsane/default.nix b/pkgs/misc/xsane/default.nix index 28a53d98b38c..8a7243a6ab50 100644 --- a/pkgs/misc/xsane/default.nix +++ b/pkgs/misc/xsane/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, saneBackends, saneFrontends, - libX11, gtk, pkgconfig, libusb ? null}: + libX11, gtk, pkgconfig, libpng, libusb ? null}: stdenv.mkDerivation { name = "xsane-0.996"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c ''; - buildInputs = [saneBackends saneFrontends libX11 gtk pkgconfig ] ++ + buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] ++ (if (libusb != null) then [libusb] else []); meta = {