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

sane-backends: enable support for PNG

Browse Source
This commit is contained in:
Peter Simons
2017-12-20 09:16:54 +01:00
parent b693f989f6
commit c9bed891f6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/sane/backends/generic.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, avahi, libjpeg, libusb1, libv4l, net_snmp , avahi, libjpeg, libusb1, libv4l, net_snmp, libpng
, gettext, pkgconfig , gettext, pkgconfig
# List of { src name backend } attibute sets - see installFirmware below: # List of { src name backend } attibute sets - see installFirmware below:
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0" ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
; ;
buildInputs = [ avahi libusb1 libv4l net_snmp ]; buildInputs = [ avahi libusb1 libv4l net_snmp libpng ];
nativeBuildInputs = [ gettext pkgconfig ]; nativeBuildInputs = [ gettext pkgconfig ];
enableParallelBuilding = true; enableParallelBuilding = true;
pkgs/top-level/all-packages.nix
+1
View File
@@ -19939,6 +19939,7 @@ with pkgs;
xsane = callPackage ../applications/graphics/sane/xsane.nix { xsane = callPackage ../applications/graphics/sane/xsane.nix {
libpng = libpng12; libpng = libpng12;
sane-backends = sane-backends.override { libpng = libpng12; };
}; };
xsw = callPackage ../applications/misc/xsw { xsw = callPackage ../applications/misc/xsw {