diff options
| author | Shea Levy <shea@shealevy.com> | 2011-12-05 17:32:45 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-12-05 17:32:45 +0000 |
| commit | 1be13f458ff3533baad8b5456b08fdc68a6b7713 (patch) | |
| tree | 87f091e0350afbe7f6cd311a31bf7d103d55b317 /pkgs | |
| parent | 3357437461eb250c1ced9dc21e4201f03aea488d (diff) | |
| download | nixpkgs-1be13f458ff3533baad8b5456b08fdc68a6b7713.tar nixpkgs-1be13f458ff3533baad8b5456b08fdc68a6b7713.tar.gz nixpkgs-1be13f458ff3533baad8b5456b08fdc68a6b7713.tar.bz2 nixpkgs-1be13f458ff3533baad8b5456b08fdc68a6b7713.tar.lz nixpkgs-1be13f458ff3533baad8b5456b08fdc68a6b7713.tar.xz nixpkgs-1be13f458ff3533baad8b5456b08fdc68a6b7713.tar.zst nixpkgs-1be13f458ff3533baad8b5456b08fdc68a6b7713.zip | |
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
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/sane-backends/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/sane-backends/snapshot.nix | 33 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 39 insertions, 1 deletions
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index 65e748b68fc..e1bd1436101 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null +{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null , gt68xxFirmware ? null }: let firmware = gt68xxFirmware {inherit fetchurl;}; @@ -20,6 +20,7 @@ stdenv.mkDerivation { 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 ''; diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix new file mode 100644 index 00000000000..8725206ddce --- /dev/null +++ b/pkgs/misc/sane-backends/snapshot.nix @@ -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 ""; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b157deb4642..fa3fdd7dd6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8486,6 +8486,10 @@ let gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null; }; + saneBackendsSnapshot = callPackage ../misc/sane-backends/snapshot.nix { + gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null; + }; + saneFrontends = callPackage ../misc/sane-front { }; slock = callPackage ../misc/screensavers/slock { }; |