hplip: 3.15.6 -> 3.15.7

This commit is contained in:
Tobias Geerinckx-Rice 2015-07-22 20:58:08 +02:00
parent 1bad2fa611
commit 603b146979

View File

@ -6,19 +6,25 @@
let
name = "hplip-3.15.6";
version = "3.15.7";
name = "hplip-${version}";
src = fetchurl {
url = "mirror://sourceforge/hplip/${name}.tar.gz";
sha256 = "1jbnjw7vrn1qawrjfdv8j58w69q8ki1qkzvlh0nk8nxacpp17i9h";
sha256 = "17flpl89lgwlbsy9mka910g530nnvlwqqnif8a9hyq7k90q9046k";
};
plugin = fetchurl {
url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
sha256 = "0fblh5m43jnws4vkwks0b4m9k3jg9kspaj1l8bic0r5swy97s41m";
};
hplip_state =
substituteAll
{
inherit version;
src = ./hplip.state;
# evaluated this way, version is always up-to-date
version = (builtins.parseDrvName name).version;
};
hplip_arch =
@ -29,11 +35,6 @@ let
"arm7l-linux" = "arm32";
}."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}");
plugin = fetchurl {
url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
sha256 = "1rymxahz12s1s37rri5qyvka6q0yi0yai08kgspg24176ry3a3fx";
};
in
stdenv.mkDerivation {
@ -74,33 +75,33 @@ stdenv.mkDerivation {
{} +
'';
preConfigure = ''
export configureFlags="$configureFlags
--with-cupsfilterdir=$out/lib/cups/filter
--with-cupsbackenddir=$out/lib/cups/backend
--with-icondir=$out/share/applications
--with-systraydir=$out/xdg/autostart
--with-mimedir=$out/etc/cups
configureFlags = ''
--with-cupsfilterdir=$(out)/lib/cups/filter
--with-cupsbackenddir=$(out)/lib/cups/backend
--with-icondir=$(out)/share/applications
--with-systraydir=$(out)/xdg/autostart
--with-mimedir=$(out)/etc/cups
--enable-policykit
"
export makeFlags="
halpredir=$out/share/hal/fdi/preprobe/10osvendor
rulesdir=$out/etc/udev/rules.d
policykit_dir=$out/share/polkit-1/actions
policykit_dbus_etcdir=$out/etc/dbus-1/system.d
policykit_dbus_sharedir=$out/share/dbus-1/system-services
hplip_confdir=$out/etc/hp
hplip_statedir=$out/var/lib/hp
";
'';
makeFlags = ''
halpredir=$(out)/share/hal/fdi/preprobe/10osvendor
rulesdir=$(out)/etc/udev/rules.d
policykit_dir=$(out)/share/polkit-1/actions
policykit_dbus_etcdir=$(out)/etc/dbus-1/system.d
policykit_dbus_sharedir=$(out)/share/dbus-1/system-services
hplip_confdir=$(out)/etc/hp
hplip_statedir=$(out)/var/lib/hp
'';
enableParallelBuilding = true;
postInstall =
(stdenv.lib.optionalString withPlugin
(let hplip_arch =
if stdenv.system == "i686-linux" then "x86_32"
else if stdenv.system == "x86_64-linux" then "x86_64"
else abort "Platform must be i686-linux or x86_64-linux!";
else abort "Plugin platform must be i686-linux or x86_64-linux!";
in
''
sh ${plugin} --noexec --keep
@ -156,6 +157,7 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "Print, scan and fax HP drivers for Linux";
homepage = http://hplipopensource.com/;
license = if withPlugin