diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-08 13:48:30 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-08 13:48:30 -0400 |
| commit | 41e9f7cfedcb804e1bd45d23cec61e57a46e8742 (patch) | |
| tree | f94b86ba54aaffb39a866a2e4b4d9642f6ea8c69 /pkgs/misc | |
| parent | c1719a58352b63d2537489ea3bf7cbe8b0b93d18 (diff) | |
| parent | 25b702d2d691636f5a763fc115157a0e81b9c421 (diff) | |
| download | nixlib-41e9f7cfedcb804e1bd45d23cec61e57a46e8742.tar nixlib-41e9f7cfedcb804e1bd45d23cec61e57a46e8742.tar.gz nixlib-41e9f7cfedcb804e1bd45d23cec61e57a46e8742.tar.bz2 nixlib-41e9f7cfedcb804e1bd45d23cec61e57a46e8742.tar.lz nixlib-41e9f7cfedcb804e1bd45d23cec61e57a46e8742.tar.xz nixlib-41e9f7cfedcb804e1bd45d23cec61e57a46e8742.tar.zst nixlib-41e9f7cfedcb804e1bd45d23cec61e57a46e8742.zip | |
Merge remote-tracking branch 'origin/master' into x-updates
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/sane-backends/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index 31372aa84186..ac6fed5deb46 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -1,21 +1,27 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null +{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null +, pkgconfig ? null , gt68xxFirmware ? null }: let firmware = gt68xxFirmware {inherit fetchurl;}; in assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); -stdenv.mkDerivation { - name = "sane-backends-1.0.22"; +stdenv.mkDerivation rec { + version = "1.0.23"; + name = "sane-backends-${version}"; src = fetchurl { - url = http://alioth.debian.org/frs/download.php/3503/sane-backends-1.0.22.tar.gz; - sha256 = "0m0cz4ljw9asqvpryl6gx1ndwf7ll2qinlvql9whnzs901la314z"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/sane-backends_${version}.orig.tar.gz"; + sha256 = "4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029"; }; udevSupport = hotplugSupport; - buildInputs = if libusb != null then [libusb] else []; + buildInputs = [] + ++ stdenv.lib.optional (libusb != null) libusb + ++ stdenv.lib.optional (libv4l != null) libv4l + ++ stdenv.lib.optional (pkgconfig != null) pkgconfig + ; postInstall = '' if test "$udevSupport" = "1"; then |