diff --git a/pkgs/misc/sane-backends/builder.sh b/pkgs/misc/sane-backends/builder.sh index f3edf124ec8..5c40eaaa9b9 100644 --- a/pkgs/misc/sane-backends/builder.sh +++ b/pkgs/misc/sane-backends/builder.sh @@ -1,9 +1,9 @@ source $stdenv/setup postInstall() { - if test "$hotplugSupport" = "1" ; then - ensureDir $out/etc/hotplug/usb/ - cp tools/hotplug/* $out/etc/hotplug/usb/ + if test "$udevSupport" = "1" ; then + ensureDir $out/etc/udev/rules.d/ + cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules fi } diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index b7e7d89c821..6f28cfe0a4c 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -3,11 +3,11 @@ assert hotplugSupport -> stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "sane-backends-1.0.17"; + name = "sane-backends-1.0.18"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/sane-backends-1.0.17.tar.gz; - md5 = "b51c10da8a81a04e1bae88c9e6556df2"; + url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.18/sane-backends-1.0.18.tar.gz; + md5 = "7ca7e2908e24721471de92cf40c75e60"; }; - inherit hotplugSupport; + udevSupport = hotplugSupport; }