Merge pull request #2617 from ttuegel/hplip
hplip: update and fix scanning
This commit is contained in:
commit
80cc011f77
|
@ -5,6 +5,8 @@ with lib;
|
||||||
let
|
let
|
||||||
|
|
||||||
pkg = if config.hardware.sane.snapshot then pkgs.saneBackendsGit else pkgs.saneBackends;
|
pkg = if config.hardware.sane.snapshot then pkgs.saneBackendsGit else pkgs.saneBackends;
|
||||||
|
backends = [ pkg ] ++ config.hardware.sane.extraBackends;
|
||||||
|
saneConfig = pkgs.mkSaneConfig { paths = backends; };
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -26,6 +28,12 @@ in
|
||||||
description = "Use a development snapshot of SANE scanner drivers.";
|
description = "Use a development snapshot of SANE scanner drivers.";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hardware.sane.extraBackends = mkOption {
|
||||||
|
type = types.listOf types.path;
|
||||||
|
default = [];
|
||||||
|
description = "Packages providing extra SANE backends to enable.";
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -33,8 +41,12 @@ in
|
||||||
|
|
||||||
config = mkIf config.hardware.sane.enable {
|
config = mkIf config.hardware.sane.enable {
|
||||||
|
|
||||||
environment.systemPackages = [ pkg ];
|
environment.systemPackages = backends;
|
||||||
services.udev.packages = [ pkg ];
|
environment.variables = {
|
||||||
|
SANE_CONFIG_DIR = "${saneConfig}/etc/sane.d";
|
||||||
|
LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ];
|
||||||
|
};
|
||||||
|
services.udev.packages = backends;
|
||||||
|
|
||||||
users.extraGroups."scanner".gid = config.ids.gids.scanner;
|
users.extraGroups."scanner".gid = config.ids.gids.scanner;
|
||||||
|
|
||||||
|
|
27
pkgs/applications/graphics/sane/config.nix
Normal file
27
pkgs/applications/graphics/sane/config.nix
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
{ stdenv }:
|
||||||
|
|
||||||
|
{ paths }:
|
||||||
|
|
||||||
|
with stdenv.lib;
|
||||||
|
let installSanePath = path: ''
|
||||||
|
find "${path}/lib/sane" -not -type d -maxdepth 1 | while read backend; do
|
||||||
|
ln -s $backend $out/lib/sane/$(basename $backend)
|
||||||
|
done
|
||||||
|
|
||||||
|
find "${path}/etc/sane.d" -not -type d -maxdepth 1 | while read conf; do
|
||||||
|
ln -s $conf $out/etc/sane.d/$(basename $conf)
|
||||||
|
done
|
||||||
|
|
||||||
|
find "${path}/etc/sane.d/dll.d" -not -type d -maxdepth 1 | while read conf; do
|
||||||
|
ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf)
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "sane-config";
|
||||||
|
phases = "installPhase";
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane
|
||||||
|
'' + concatMapStrings installSanePath paths;
|
||||||
|
}
|
|
@ -1,26 +1,34 @@
|
||||||
{stdenv, fetchurl, cups, zlib, libjpeg, libusb, pythonPackages, saneBackends, dbus
|
{ stdenv, fetchurl, automake, pkgconfig
|
||||||
, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
|
, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
|
||||||
|
, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
|
||||||
|
, withPlugin ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "hplip-3.11.1";
|
name = "hplip-3.14.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/hplip/${name}.tar.gz";
|
url = "mirror://sourceforge/hplip/${name}.tar.gz";
|
||||||
sha256 = "0y68s4xm5d0kv7p5j41qq0xglp4vdbjwbrjs89b4a21wwn69hp9g";
|
sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f";
|
||||||
};
|
};
|
||||||
|
|
||||||
#preBuild=''
|
plugin = fetchurl {
|
||||||
# makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
|
url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
|
||||||
#'';
|
sha256 = "0k1vpmy7babbm3c5v4dcbhq0jgyr8as722nylfs8zx0dy7kr8874";
|
||||||
|
};
|
||||||
|
|
||||||
|
hplip_state = ./hplip.state;
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in
|
# HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
|
||||||
sed -i s,/etc/hp/,$out/etc/hp/, base/g.py
|
find . -type f -exec sed -i s,/etc/hp,$out/etc/hp, {} \;
|
||||||
|
find . -type f -exec sed -i s,/etc/sane.d,$out/etc/sane.d, {} \;
|
||||||
|
find . -type f -exec sed -i s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, {} \;
|
||||||
|
find . -type f -exec sed -i s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, {} \;
|
||||||
|
find . -type f -exec sed -i s,/usr/lib/systemd/system,$out/lib/systemd/system, {} \;
|
||||||
|
find . -type f -exec sed -i s,/var/lib/hp,$out/var/lib/hp, {} \;
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# --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
|
||||||
|
@ -33,23 +41,66 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
export makeFlags="
|
export makeFlags="
|
||||||
halpredir=$out/share/hal/fdi/preprobe/10osvendor
|
halpredir=$out/share/hal/fdi/preprobe/10osvendor
|
||||||
hplip_statedir=$out/var
|
|
||||||
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
|
||||||
";
|
";
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall =
|
||||||
|
''
|
||||||
wrapPythonPrograms
|
wrapPythonPrograms
|
||||||
'';
|
''
|
||||||
|
+ (stdenv.lib.optionalString withPlugin
|
||||||
|
(let hplip_arch =
|
||||||
|
if builtins.currentSystem == "i686-linux"
|
||||||
|
then "x86_32"
|
||||||
|
else if builtins.currentSystem == "x86_64-linux"
|
||||||
|
then "x86_64"
|
||||||
|
else abort "Platform must be i686-linux or x86_64-linux!";
|
||||||
|
in
|
||||||
|
''
|
||||||
|
sh ${plugin} --noexec --keep
|
||||||
|
cd plugin_tmp
|
||||||
|
|
||||||
|
cp plugin.spec $out/share/hplip/
|
||||||
|
|
||||||
|
mkdir -p $out/share/hplip/data/firmware
|
||||||
|
cp *.fw.gz $out/share/hplip/data/firmware
|
||||||
|
|
||||||
|
mkdir -p $out/share/hplip/data/plugins
|
||||||
|
cp license.txt $out/share/hplip/data/plugins
|
||||||
|
|
||||||
|
mkdir -p $out/share/hplip/prnt/plugins
|
||||||
|
for plugin in lj hbpl1; do
|
||||||
|
cp $plugin-${hplip_arch}.so $out/share/hplip/prnt/plugins
|
||||||
|
ln -s $out/share/hplip/prnt/plugins/$plugin-${hplip_arch}.so \
|
||||||
|
$out/share/hplip/prnt/plugins/$plugin.so
|
||||||
|
done
|
||||||
|
|
||||||
|
mkdir -p $out/share/hplip/scan/plugins
|
||||||
|
for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do
|
||||||
|
cp $plugin-${hplip_arch}.so $out/share/hplip/scan/plugins
|
||||||
|
ln -s $out/share/hplip/scan/plugins/$plugin-${hplip_arch}.so \
|
||||||
|
$out/share/hplip/scan/plugins/$plugin.so
|
||||||
|
done
|
||||||
|
|
||||||
|
mkdir -p $out/var/lib/hp
|
||||||
|
cp ${hplip_state} $out/var/lib/hp/hplip.state
|
||||||
|
|
||||||
|
mkdir -p $out/etc/sane.d/dll.d
|
||||||
|
mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf
|
||||||
|
|
||||||
|
rm $out/etc/udev/rules.d/56-hpmud.rules
|
||||||
|
''));
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libjpeg
|
libjpeg
|
||||||
cups
|
cups
|
||||||
libusb
|
libusb1
|
||||||
pythonPackages.python
|
pythonPackages.python
|
||||||
pythonPackages.wrapPython
|
pythonPackages.wrapPython
|
||||||
saneBackends
|
saneBackends
|
||||||
|
@ -59,15 +110,18 @@ stdenv.mkDerivation rec {
|
||||||
] ++ stdenv.lib.optional qtSupport qt4;
|
] ++ stdenv.lib.optional qtSupport qt4;
|
||||||
|
|
||||||
pythonPath = with pythonPackages; [
|
pythonPath = with pythonPackages; [
|
||||||
|
pillow
|
||||||
pythonDBus
|
pythonDBus
|
||||||
pygobject
|
pygobject
|
||||||
recursivePthLoader
|
recursivePthLoader
|
||||||
|
reportlab
|
||||||
] ++ stdenv.lib.optional qtSupport pyqt4;
|
] ++ stdenv.lib.optional qtSupport pyqt4;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
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 = if withPlugin then licenses.unfree else "free"; # MIT/BSD/GPL
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ ttuegel ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
4
pkgs/misc/drivers/hplip/hplip.state
Normal file
4
pkgs/misc/drivers/hplip/hplip.state
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
[plugin]
|
||||||
|
installed=1
|
||||||
|
eula=1
|
||||||
|
version=3.14.4
|
|
@ -10739,6 +10739,8 @@ let
|
||||||
|
|
||||||
hplip = callPackage ../misc/drivers/hplip { };
|
hplip = callPackage ../misc/drivers/hplip { };
|
||||||
|
|
||||||
|
hplipWithPlugin = hplip.override { withPlugin = true; };
|
||||||
|
|
||||||
# using the new configuration style proposal which is unstable
|
# using the new configuration style proposal which is unstable
|
||||||
jack1d = callPackage ../misc/jackaudio/jack1.nix { };
|
jack1d = callPackage ../misc/jackaudio/jack1.nix { };
|
||||||
|
|
||||||
|
@ -10868,6 +10870,8 @@ let
|
||||||
hotplugSupport = config.sane.hotplugSupport or true;
|
hotplugSupport = config.sane.hotplugSupport or true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };
|
||||||
|
|
||||||
saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { };
|
saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { };
|
||||||
|
|
||||||
seafile-shared = callPackage ../misc/seafile-shared { };
|
seafile-shared = callPackage ../misc/seafile-shared { };
|
||||||
|
|
Loading…
Reference in a new issue