alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #5886 from ttuegel/hplip

Browse source 
Update HPLIP and fix for CUPS 1.7
This commit is contained in:
Thomas Tuegel 2015-01-21 07:59:49 -06:00
parent 62d0ad3ce0 28b55a318a
commit b89fbb6188
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/misc/drivers/hplip/default.nix
View file

@ -1,23 +1,35 @@
{ stdenv, fetchurl, automake, pkgconfig { stdenv, fetchurl, automake, pkgconfig
, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus , cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp , polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
, withPlugin ? false , withPlugin ? false, substituteAll
}: }:
stdenv.mkDerivation rec { let
name = "hplip-3.14.4";
name = "hplip-3.14.10";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/hplip/${name}.tar.gz"; url = "mirror://sourceforge/hplip/${name}.tar.gz";
sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f"; sha256 = "164mm30yb61psk5j4ziybxdd310y09fixgl09hmb59ny261wvcqi";
}; };
hplip_state =
substituteAll
{
src = ./hplip.state;
# evaluated this way, version is always up-to-date
version = (builtins.parseDrvName name).version;
};
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 = "0k1vpmy7babbm3c5v4dcbhq0jgyr8as722nylfs8zx0dy7kr8874"; sha256 = "10cvgy1h84fwh7xpw4x6cbkpisqbn3nbcqrgd9xz5fc6mn0b95dk";
}; };
hplip_state = ./hplip.state; in
stdenv.mkDerivation {
inherit name src;
prePatch = '' prePatch = ''
# HPLIP hardcodes absolute paths everywhere. Nuke from orbit. # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.

2
pkgs/misc/drivers/hplip/hplip.state
View file

@ -1,4 +1,4 @@
[plugin] [plugin]
installed=1 installed=1
eula=1 eula=1
version=3.14.4 version=@version@