From 3a6c172b77fc20bb63ae02b471a1b45dd29bea4d Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 21 Sep 2010 01:24:00 +0000 Subject: [PATCH] HPLiP: Fix compilation. Had to move the comment out of configure flags. Very sneaky! Make hydra compile it. svn path=/nixpkgs/trunk/; revision=23878 --- pkgs/misc/drivers/hplip/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index f5e9ad9d890..0cb90aa71d8 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -15,9 +15,11 @@ stdenv.mkDerivation { #''; prePatch = '' - sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in + sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in ''; + # --disable-network-build Until we have snmp + preConfigure = '' export configureFlags="$configureFlags --with-cupsfilterdir=$out/lib/cups/filter @@ -25,7 +27,6 @@ stdenv.mkDerivation { --with-icondir=$out/share/applications --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups - # Until we have snmp --disable-network-build" export makeFlags=" @@ -39,9 +40,10 @@ stdenv.mkDerivation { buildInputs = [libjpeg cups libusb python saneBackends dbus pkgconfig] ++ stdenv.lib.optional qtSupport qt4; - meta = { + meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = http://hplipopensource.com/; license = "free"; # MIT/BSD/GPL + platforms = platforms.linux; }; }