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

Merge pull request #78198 from romildo/upd.sane

Browse Source 
sane-backends: 1.0.27 -> 1.0.28
This commit is contained in:
Peter Simons 2020-01-26 10:30:33 +01:00 committed by GitHub
commit ba8fbd5352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/graphics/sane/backends/default.nix
View File

@ -1,11 +1,10 @@
{ callPackage, fetchurl, ... } @ args: { callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "1.0.27"; version = "1.0.28";
src = fetchurl { src = fetchurl {
sha256 = "1j9nbqspaj0rlgalafb5z6r606k0i22kz0rcpd744p176yzlfdr9"; url = "https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/sane-backends-${version}.tar.gz";
urls = [ sha256 = "00yy8q9hqdf0zjxxl4d8njr9zf0hhi3a9ib23ikc2anqf8zhy9ii";
"https://alioth-archive.debian.org/releases/sane/sane-backends/${version}/sane-backends-${version}.tar.gz"
];
}; };
}) })

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

@ -1,6 +1,6 @@
{ stdenv { stdenv
, avahi, libjpeg, libusb1, libv4l, net-snmp, libpng
, gettext, pkgconfig , gettext, pkgconfig
, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
# List of { src name backend } attibute sets - see installFirmware below: # List of { src name backend } attibute sets - see installFirmware below:
, extraFirmware ? [] , extraFirmware ? []
@ -19,14 +19,29 @@ stdenv.mkDerivation {
outputs = [ "out" "doc" "man" ]; outputs = [ "out" "doc" "man" ];
nativeBuildInputs = [
gettext
pkgconfig
];
buildInputs = [
avahi
libgphoto2
libieee1284
libjpeg
libpng
libtiff
libusb1
libv4l
net-snmp
];
enableParallelBuilding = true;
configureFlags = [] configureFlags = []
++ stdenv.lib.optional (avahi != null) "--enable-avahi" ++ stdenv.lib.optional (avahi != null) "--enable-avahi"
++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0" ++ stdenv.lib.optional (libusb1 != null) "--with-usb"
; ;
buildInputs = [ avahi libusb1 libv4l net-snmp libpng ];
nativeBuildInputs = [ gettext pkgconfig ];
enableParallelBuilding = true;
postInstall = let postInstall = let
@ -71,7 +86,7 @@ stdenv.mkDerivation {
video- and still-cameras, frame-grabbers, etc. For a list of supported video- and still-cameras, frame-grabbers, etc. For a list of supported
scanners, see http://www.sane-project.org/sane-backends.html. 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; license = licenses.gpl2Plus;
maintainers = with maintainers; [ peti ]; maintainers = with maintainers; [ peti ];