diff options
| -rw-r--r-- | pkgs/applications/graphics/sane/backends/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 3ef23142b2ed..5d35857f05e1 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, avahi, libjpeg, libusb1, libv4l, net_snmp +, avahi, libjpeg, libusb1, libv4l, net_snmp, libpng , gettext, pkgconfig # 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" ; - buildInputs = [ avahi libusb1 libv4l net_snmp ]; + buildInputs = [ avahi libusb1 libv4l net_snmp libpng ]; nativeBuildInputs = [ gettext pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e932b267aa25..6ab29b7ee9af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19939,6 +19939,7 @@ with pkgs; xsane = callPackage ../applications/graphics/sane/xsane.nix { libpng = libpng12; + sane-backends = sane-backends.override { libpng = libpng12; }; }; xsw = callPackage ../applications/misc/xsw { |