summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorEvgeny Egorochkin <phreedom.stdin@gmail.com>2010-10-14 11:54:19 +0000
committerEvgeny Egorochkin <phreedom.stdin@gmail.com>2010-10-14 11:54:19 +0000
commit9822e68b192ad4505f2ebdd813b8ebb5686efba1 (patch)
tree7cebd75046e21cb0d451f01c0f4744e0984a6f24 /pkgs/misc
parentcd9d20d2e7901963ce66e4a847f9f48b5b89a929 (diff)
downloadnixlib-9822e68b192ad4505f2ebdd813b8ebb5686efba1.tar
nixlib-9822e68b192ad4505f2ebdd813b8ebb5686efba1.tar.gz
nixlib-9822e68b192ad4505f2ebdd813b8ebb5686efba1.tar.bz2
nixlib-9822e68b192ad4505f2ebdd813b8ebb5686efba1.tar.lz
nixlib-9822e68b192ad4505f2ebdd813b8ebb5686efba1.tar.xz
nixlib-9822e68b192ad4505f2ebdd813b8ebb5686efba1.tar.zst
nixlib-9822e68b192ad4505f2ebdd813b8ebb5686efba1.zip
sane-backends: fix firmware loading for gt86xx-based scanners
svn path=/nixpkgs/trunk/; revision=24280
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/sane-backends/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
index 63fb29a7eb35..65e748b68fcf 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/misc/sane-backends/default.nix
@@ -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 @@ stdenv.mkDerivation {
 
   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 "";
 }