summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-25 03:43:02 +0100
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-25 03:43:18 +0100
commit87df7fc7458edeb647770849a0dad526edbbea67 (patch)
tree97a5c16ec7fef104ed94b8704bec9998b9272c15
parentlibconfuse: init at 2.8 (diff)
downloadnixpkgs-87df7fc7458edeb647770849a0dad526edbbea67.tar.gz
sane-backends: propagate libjpeg library path
-rw-r--r--pkgs/applications/graphics/sane/backends/generic.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index e98774a43681..b597250098fe 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
-, avahi, libusb1, libv4l, net_snmp
+, avahi, libjpeg, libusb1, libv4l, net_snmp
, gettext, pkgconfig
# List of { src name backend } attibute sets - see installFirmware below:
@@ -50,6 +50,9 @@ stdenv.mkDerivation {
mkdir -p $out/etc/udev/rules.d/
./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
+
+ substituteInPlace $out/lib/libsane.la \
+ --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg"
'' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);
meta = with stdenv.lib; {