mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Apply mornfall's SANE patches
Fix sane-backends to generate udev rules, add a snapshot of sane-backends's unstable repo, and add a SANE nixos module svn path=/nixpkgs/trunk/; revision=30764
This commit is contained in:
parent
3357437461
commit
1be13f458f
3 changed files with 39 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null
|
{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
|
||||||
, gt68xxFirmware ? null }:
|
, gt68xxFirmware ? null }:
|
||||||
let
|
let
|
||||||
firmware = gt68xxFirmware {inherit fetchurl;};
|
firmware = gt68xxFirmware {inherit fetchurl;};
|
||||||
|
@ -20,6 +20,7 @@ stdenv.mkDerivation {
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
if test "$udevSupport" = "1"; then
|
if test "$udevSupport" = "1"; then
|
||||||
ensureDir $out/etc/udev/rules.d/
|
ensureDir $out/etc/udev/rules.d/
|
||||||
|
./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
|
||||||
cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
|
cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
33
pkgs/misc/sane-backends/snapshot.nix
Normal file
33
pkgs/misc/sane-backends/snapshot.nix
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
|
||||||
|
, gt68xxFirmware ? null }:
|
||||||
|
let
|
||||||
|
firmware = gt68xxFirmware {inherit fetchurl;};
|
||||||
|
in
|
||||||
|
assert hotplugSupport -> stdenv.system == "i686-linux";
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "sane-backends-1.0.22.git201111204";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = http://www.sane-project.org/snapshots/sane-backends-git20111204.tar.gz;
|
||||||
|
sha256 = "00b3fi8zjrq3in0wndz1xcz228mgfhwhh2knmyjsikr88hal0m47";
|
||||||
|
};
|
||||||
|
|
||||||
|
udevSupport = hotplugSupport;
|
||||||
|
|
||||||
|
buildInputs = if libusb != null then [libusb] else [];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
if test "$udevSupport" = "1"; then
|
||||||
|
ensureDir $out/etc/udev/rules.d/
|
||||||
|
./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
|
||||||
|
cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
|
preInstall =
|
||||||
|
if gt68xxFirmware != null then
|
||||||
|
"mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
|
||||||
|
" \${out}/share/sane/gt68xx/" + firmware.name
|
||||||
|
else "";
|
||||||
|
}
|
|
@ -8486,6 +8486,10 @@ let
|
||||||
gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
|
gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
saneBackendsSnapshot = callPackage ../misc/sane-backends/snapshot.nix {
|
||||||
|
gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
|
||||||
|
};
|
||||||
|
|
||||||
saneFrontends = callPackage ../misc/sane-front { };
|
saneFrontends = callPackage ../misc/sane-front { };
|
||||||
|
|
||||||
slock = callPackage ../misc/screensavers/slock { };
|
slock = callPackage ../misc/screensavers/slock { };
|
||||||
|
|
Loading…
Reference in a new issue