From cf699caf4d9be4445b3516f9b9b362dd3d442edf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 25 Dec 2015 15:56:05 +0100 Subject: [PATCH] saneBackends: don't add option for 1 udev rule --- pkgs/applications/graphics/sane/backends/generic.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index a8963b438b8..9fbeb612614 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -2,13 +2,9 @@ , avahi, libusb1, libv4l, net_snmp , gettext, pkgconfig , gt68xxFirmware ? null, snapscanFirmware ? null -, hotplugSupport ? true , version, src, ... }: -assert hotplugSupport -> - builtins.elem stdenv.system [ "i686-linux" "x86_64-linux" ]; - stdenv.mkDerivation { inherit src; @@ -25,11 +21,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext pkgconfig ]; postInstall = '' - if test "$hotplugSupport" = "1"; then - mkdir -p $out/etc/udev/rules.d/ - ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ - cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules - fi + mkdir -p $out/etc/udev/rules.d/ + ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ + cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules ''; preInstall = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08259db1cb7..a9593b36186 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15542,13 +15542,11 @@ let saneBackends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null; snapscanFirmware = config.sane.snapscanFirmware or null; - hotplugSupport = config.sane.hotplugSupport or true; }; saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix { gt68xxFirmware = config.sane.gt68xxFirmware or null; snapscanFirmware = config.sane.snapscanFirmware or null; - hotplugSupport = config.sane.hotplugSupport or true; }; mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };