public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

saneBackends: don't add option for 1 udev rule

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2015-12-25 15:56:05 +01:00
parent f3048aed1d
commit cf699caf4d
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/sane/backends/generic.nix
View File

@ -2,13 +2,9 @@
, avahi, libusb1, libv4l, net_snmp , avahi, libusb1, libv4l, net_snmp
, gettext, pkgconfig , gettext, pkgconfig
, gt68xxFirmware ? null, snapscanFirmware ? null , gt68xxFirmware ? null, snapscanFirmware ? null
, hotplugSupport ? true
, version, src, ... , version, src, ...
}: }:
assert hotplugSupport ->
builtins.elem stdenv.system [ "i686-linux" "x86_64-linux" ];
stdenv.mkDerivation { stdenv.mkDerivation {
inherit src; inherit src;
@ -25,11 +21,9 @@ stdenv.mkDerivation {
nativeBuildInputs = [ gettext pkgconfig ]; nativeBuildInputs = [ gettext pkgconfig ];
postInstall = '' postInstall = ''
if test "$hotplugSupport" = "1"; then mkdir -p $out/etc/udev/rules.d/
mkdir -p $out/etc/udev/rules.d/ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
./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
cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
fi
''; '';
preInstall = preInstall =

2
pkgs/top-level/all-packages.nix
View File

@ -15542,13 +15542,11 @@ let
saneBackends = callPackage ../applications/graphics/sane/backends { saneBackends = callPackage ../applications/graphics/sane/backends {
gt68xxFirmware = config.sane.gt68xxFirmware or null; gt68xxFirmware = config.sane.gt68xxFirmware or null;
snapscanFirmware = config.sane.snapscanFirmware or null; snapscanFirmware = config.sane.snapscanFirmware or null;
hotplugSupport = config.sane.hotplugSupport or true;
}; };
saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix { saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix {
gt68xxFirmware = config.sane.gt68xxFirmware or null; gt68xxFirmware = config.sane.gt68xxFirmware or null;
snapscanFirmware = config.sane.snapscanFirmware or null; snapscanFirmware = config.sane.snapscanFirmware or null;
hotplugSupport = config.sane.hotplugSupport or true;
}; };
mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { }; mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };