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

Forgotten part of xsane: Use libpng specified, not the one propagated

Browse Source 
svn path=/nixpkgs/trunk/; revision=32822
This commit is contained in:
Michael Raskin 2012-03-06 12:21:09 +00:00
parent 2989ce0cac
commit ef3a71007a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/xsane/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, saneBackends, saneFrontends, {stdenv, fetchurl, saneBackends, saneFrontends,
libX11, gtk, pkgconfig, libusb ? null}: libX11, gtk, pkgconfig, libpng, libusb ? null}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xsane-0.996"; name = "xsane-0.996";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c 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 []); (if (libusb != null) then [libusb] else []);
meta = { meta = {