From 61106207cd3b53861a0ade8b2ff655045c7ee25c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 21 Dec 2015 00:01:37 +0100 Subject: [PATCH] saneBackends: remove some redundancies (no hash change) --- pkgs/applications/graphics/sane/backends/generic.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 0324acec6c7..c5c8d837a20 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"