Author: raskin
Date: Tue Mar 6 12:21:09 2012
New Revision: 32822
URL: https://nixos.org/websvn/nix/?rev=32822&sc=1
Log:
Forgotten part of xsane: Use libpng specified, not the one propagated
Modified:
nixpkgs/trunk/pkgs/misc/xsane/default.nix
Modified: nixpkgs/trunk/pkgs/misc/xsane/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/xsane/default.nix Tue Mar 6 11:36:22 2012
(r32821)
+++ nixpkgs/trunk/pkgs/misc/xsane/default.nix Tue Mar 6 12:21:09 2012
(r32822)
@@ -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 @@
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 = {
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
