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

HPLiP: Fix compilation. Had to move the comment out of configure flags. Very sneaky!

Browse Source 
Make hydra compile it.

svn path=/nixpkgs/trunk/; revision=23878
This commit is contained in:
Evgeny Egorochkin 2010-09-21 01:24:00 +00:00
parent 020cba6b98
commit 3a6c172b77
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/misc/drivers/hplip/default.nix
View File

@ -15,9 +15,11 @@ stdenv.mkDerivation {
#''; #'';
prePatch = '' 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 = '' preConfigure = ''
export configureFlags="$configureFlags export configureFlags="$configureFlags
--with-cupsfilterdir=$out/lib/cups/filter --with-cupsfilterdir=$out/lib/cups/filter
@ -25,7 +27,6 @@ stdenv.mkDerivation {
--with-icondir=$out/share/applications --with-icondir=$out/share/applications
--with-systraydir=$out/xdg/autostart --with-systraydir=$out/xdg/autostart
--with-mimedir=$out/etc/cups --with-mimedir=$out/etc/cups
# Until we have snmp
--disable-network-build" --disable-network-build"
export makeFlags=" export makeFlags="
@ -39,9 +40,10 @@ stdenv.mkDerivation {
buildInputs = [libjpeg cups libusb python saneBackends dbus pkgconfig] ++ buildInputs = [libjpeg cups libusb python saneBackends dbus pkgconfig] ++
stdenv.lib.optional qtSupport qt4; stdenv.lib.optional qtSupport qt4;
meta = { meta = with stdenv.lib; {
description = "Print, scan and fax HP drivers for Linux"; description = "Print, scan and fax HP drivers for Linux";
homepage = http://hplipopensource.com/; homepage = http://hplipopensource.com/;
license = "free"; # MIT/BSD/GPL license = "free"; # MIT/BSD/GPL
platforms = platforms.linux;
}; };
} }