diff options
| author | Peter Simons <simons@cryp.to> | 2020-01-26 10:30:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-26 10:30:33 +0100 |
| commit | ba8fbd5352b8aca9410b10c8aa78e84740529e87 (patch) | |
| tree | 0843c4765b2a8e72a8f3db2b8fbfa9c892bb672b /pkgs/applications/graphics | |
| parent | 73a59af35bb72e74c928515aeb6ed6d3f03c9034 (diff) | |
| parent | 58a26351c93b6968b0ead3603951c922371226c4 (diff) | |
| download | nixlib-ba8fbd5352b8aca9410b10c8aa78e84740529e87.tar nixlib-ba8fbd5352b8aca9410b10c8aa78e84740529e87.tar.gz nixlib-ba8fbd5352b8aca9410b10c8aa78e84740529e87.tar.bz2 nixlib-ba8fbd5352b8aca9410b10c8aa78e84740529e87.tar.lz nixlib-ba8fbd5352b8aca9410b10c8aa78e84740529e87.tar.xz nixlib-ba8fbd5352b8aca9410b10c8aa78e84740529e87.tar.zst nixlib-ba8fbd5352b8aca9410b10c8aa78e84740529e87.zip | |
Merge pull request #78198 from romildo/upd.sane
sane-backends: 1.0.27 -> 1.0.28
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/sane/backends/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/graphics/sane/backends/generic.nix | 31 |
2 files changed, 27 insertions, 13 deletions
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 4245acf716d5..6aba42d33e63 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -1,11 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.0.27"; + version = "1.0.28"; + src = fetchurl { - sha256 = "1j9nbqspaj0rlgalafb5z6r606k0i22kz0rcpd744p176yzlfdr9"; - urls = [ - "https://alioth-archive.debian.org/releases/sane/sane-backends/${version}/sane-backends-${version}.tar.gz" - ]; + url = "https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/sane-backends-${version}.tar.gz"; + sha256 = "00yy8q9hqdf0zjxxl4d8njr9zf0hhi3a9ib23ikc2anqf8zhy9ii"; }; }) diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 0e8a5f34f6c1..d3e8b417017d 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,6 +1,6 @@ { stdenv -, avahi, libjpeg, libusb1, libv4l, net-snmp, libpng , gettext, pkgconfig +, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp # List of { src name backend } attibute sets - see installFirmware below: , extraFirmware ? [] @@ -19,15 +19,30 @@ stdenv.mkDerivation { outputs = [ "out" "doc" "man" ]; - configureFlags = [] - ++ stdenv.lib.optional (avahi != null) "--enable-avahi" - ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0" - ; + nativeBuildInputs = [ + gettext + pkgconfig + ]; + + buildInputs = [ + avahi + libgphoto2 + libieee1284 + libjpeg + libpng + libtiff + libusb1 + libv4l + net-snmp + ]; - buildInputs = [ avahi libusb1 libv4l net-snmp libpng ]; - nativeBuildInputs = [ gettext pkgconfig ]; enableParallelBuilding = true; + configureFlags = [] + ++ stdenv.lib.optional (avahi != null) "--enable-avahi" + ++ stdenv.lib.optional (libusb1 != null) "--with-usb" + ; + postInstall = let compatFirmware = extraFirmware @@ -71,7 +86,7 @@ stdenv.mkDerivation { video- and still-cameras, frame-grabbers, etc. For a list of supported scanners, see http://www.sane-project.org/sane-backends.html. ''; - homepage = http://www.sane-project.org/; + homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peti ]; |