Author: egorochkin
Date: Thu Oct 14 11:54:19 2010
New Revision: 24280
URL: https://svn.nixos.org/websvn/nix/?rev=24280&sc=1
Log:
sane-backends: fix firmware loading for gt86xx-based scanners
Modified:
nixpkgs/trunk/pkgs/misc/sane-backends/default.nix
Modified: nixpkgs/trunk/pkgs/misc/sane-backends/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/sane-backends/default.nix Thu Oct 14 11:54:13
2010 (r24279)
+++ nixpkgs/trunk/pkgs/misc/sane-backends/default.nix Thu Oct 14 11:54:19
2010 (r24280)
@@ -1,6 +1,8 @@
{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null
, gt68xxFirmware ? null }:
-
+let
+ firmware = gt68xxFirmware {inherit fetchurl;};
+in
assert hotplugSupport -> stdenv.system == "i686-linux";
stdenv.mkDerivation {
@@ -24,8 +26,7 @@
preInstall =
if gt68xxFirmware != null then
- "mkdir -p \${out}/share/sane/gt68xx ; ln -s " +
- (gt68xxFirmware {inherit fetchurl;}) +
- " \${out}/share/sane/gt68xx/PS1fw.usb "
+ "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
+ " \${out}/share/sane/gt68xx/" + firmware.name
else "";
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
