diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-23 21:31:23 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-23 21:31:23 +0100 |
| commit | 0bf71add7818e885a0cbf93f3b853a7a57a57d56 (patch) | |
| tree | 81cb15f6ff7582c758f959585463814717745262 /pkgs/misc | |
| parent | 0dc8926b06bfc433417811edd28e472bf18d4814 (diff) | |
| download | nixlib-0bf71add7818e885a0cbf93f3b853a7a57a57d56.tar nixlib-0bf71add7818e885a0cbf93f3b853a7a57a57d56.tar.gz nixlib-0bf71add7818e885a0cbf93f3b853a7a57a57d56.tar.bz2 nixlib-0bf71add7818e885a0cbf93f3b853a7a57a57d56.tar.lz nixlib-0bf71add7818e885a0cbf93f3b853a7a57a57d56.tar.xz nixlib-0bf71add7818e885a0cbf93f3b853a7a57a57d56.tar.zst nixlib-0bf71add7818e885a0cbf93f3b853a7a57a57d56.zip | |
sane-backends: update snapshot to version: 1.0.22.git20121123
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/sane-backends/snapshot.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix index 636ae37ec05b..8b74db5df44d 100644 --- a/pkgs/misc/sane-backends/snapshot.nix +++ b/pkgs/misc/sane-backends/snapshot.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null -, gt68xxFirmware ? null }: +{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null }: let - firmware = gt68xxFirmware {inherit fetchurl;}; + firmware = gt68xxFirmware { inherit fetchurl; }; in -assert hotplugSupport -> stdenv.system == "i686-linux"; +assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { - name = "sane-backends-1.0.22.git201111204"; - + name = "sane-backends-1.0.22.git20121123"; + src = fetchurl { - url = http://www.sane-project.org/snapshots/sane-backends-git20111204.tar.gz; - sha256 = "00b3fi8zjrq3in0wndz1xcz228mgfhwhh2knmyjsikr88hal0m47"; + url = "http://www.sane-project.org/snapshots/sane-backends-git20121123.tar.gz"; + sha256 = "d13a8c9e85af52f7be2e45c70cb93a76ec04b76e7fc983809e7d70389b6e7ae5"; }; - + udevSupport = hotplugSupport; buildInputs = if libusb != null then [libusb] else []; @@ -26,7 +25,7 @@ stdenv.mkDerivation { ''; preInstall = - if gt68xxFirmware != null then + if gt68xxFirmware != null then "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + " \${out}/share/sane/gt68xx/" + firmware.name else ""; |