about summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-12-21 00:01:37 +0100
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-12-24 04:05:57 +0100
commit61106207cd3b53861a0ade8b2ff655045c7ee25c (patch)
tree00fbc160d80cbb2ffbbec57ef5d1edea0a99593f /pkgs/applications/graphics
parent58bf69407125d47683e28502f01d0426660417a4 (diff)
downloadnixlib-61106207cd3b53861a0ade8b2ff655045c7ee25c.tar
nixlib-61106207cd3b53861a0ade8b2ff655045c7ee25c.tar.gz
nixlib-61106207cd3b53861a0ade8b2ff655045c7ee25c.tar.bz2
nixlib-61106207cd3b53861a0ade8b2ff655045c7ee25c.tar.lz
nixlib-61106207cd3b53861a0ade8b2ff655045c7ee25c.tar.xz
nixlib-61106207cd3b53861a0ade8b2ff655045c7ee25c.tar.zst
nixlib-61106207cd3b53861a0ade8b2ff655045c7ee25c.zip
saneBackends: remove some redundancies (no hash change)
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/sane/backends/generic.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 0324acec6c70..c5c8d837a209 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -6,12 +6,11 @@
 , version, src, ...
 }:
 
-assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
+assert hotplugSupport ->
+  builtins.elem stdenv.system [ "i686-linux" "x86_64-linux" ];
 
 let
 
-  firmware = gt68xxFirmware { inherit fetchurl; };
-
   udevSupport = hotplugSupport;
 
 in
@@ -41,8 +40,8 @@ stdenv.mkDerivation {
 
   preInstall =
     if gt68xxFirmware != null then
-      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
-      " \${out}/share/sane/gt68xx/" + firmware.name
+      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + gt68xxFirmware.fw +
+      " \${out}/share/sane/gt68xx/" + gt68xxFirmware.name
     else if snapscanFirmware != null then
       "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware +
       " \${out}/share/sane/snapscan/your-firmwarefile.bin"