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

hplip: 3.15.7 -> 3.15.6

Browse Source 
Version 3.15.7 breaks certain (but not all) PCL-based printers:
b0e46fc3ea

Forgetting to revert a failed patch hunk certainly didn't help. Grr.
This commit is contained in:
Tobias Geerinckx-Rice 2015-08-04 19:29:35 +02:00
parent c22c874aeb
commit b62debe042
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,18 +6,20 @@
let let
version = "3.15.7"; # Version 3.15.7 breaks certain (but not all) PCL-based printers:
# https://github.com/NixOS/nixpkgs/commit/b0e46fc3ead209ef24ed6214bd41ef6e604af54f
version = "3.15.6";
name = "hplip-${version}"; name = "hplip-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/hplip/${name}.tar.gz"; url = "mirror://sourceforge/hplip/${name}.tar.gz";
sha256 = "17flpl89lgwlbsy9mka910g530nnvlwqqnif8a9hyq7k90q9046k"; sha256 = "1jbnjw7vrn1qawrjfdv8j58w69q8ki1qkzvlh0nk8nxacpp17i9h";
}; };
plugin = fetchurl { plugin = fetchurl {
url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
sha256 = "0fblh5m43jnws4vkwks0b4m9k3jg9kspaj1l8bic0r5swy97s41m"; sha256 = "1rymxahz12s1s37rri5qyvka6q0yi0yai08kgspg24176ry3a3fx";
}; };
hplip_state = hplip_state =
@ -75,23 +77,25 @@ stdenv.mkDerivation {
{} + {} +
''; '';
configureFlags = '' preConfigure = ''
--with-cupsfilterdir=$(out)/lib/cups/filter export configureFlags="$configureFlags
--with-cupsbackenddir=$(out)/lib/cups/backend --with-cupsfilterdir=$out/lib/cups/filter
--with-icondir=$(out)/share/applications --with-cupsbackenddir=$out/lib/cups/backend
--with-systraydir=$(out)/xdg/autostart --with-icondir=$out/share/applications
--with-mimedir=$(out)/etc/cups --with-systraydir=$out/xdg/autostart
--enable-policykit --with-mimedir=$out/etc/cups
''; --enable-policykit
"
makeFlags = '' export makeFlags="
halpredir=$(out)/share/hal/fdi/preprobe/10osvendor halpredir=$out/share/hal/fdi/preprobe/10osvendor
rulesdir=$(out)/etc/udev/rules.d rulesdir=$out/etc/udev/rules.d
policykit_dir=$(out)/share/polkit-1/actions policykit_dir=$out/share/polkit-1/actions
policykit_dbus_etcdir=$(out)/etc/dbus-1/system.d policykit_dbus_etcdir=$out/etc/dbus-1/system.d
policykit_dbus_sharedir=$(out)/share/dbus-1/system-services policykit_dbus_sharedir=$out/share/dbus-1/system-services
hplip_confdir=$(out)/etc/hp hplip_confdir=$out/etc/hp
hplip_statedir=$(out)/var/lib/hp hplip_statedir=$out/var/lib/hp
"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;