diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-03 03:31:38 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-03 03:31:38 +0100 |
| commit | 99075fb402505d95359aadf3993b12c2d2661771 (patch) | |
| tree | 2f2e85e697c77029ef2bf3d6f0e2bfcf8f3af3de /pkgs/applications/graphics/sane | |
| parent | 6a862c5a61a755d8faca31623aa4fd6a84f7a27f (diff) | |
| download | nixlib-99075fb402505d95359aadf3993b12c2d2661771.tar nixlib-99075fb402505d95359aadf3993b12c2d2661771.tar.gz nixlib-99075fb402505d95359aadf3993b12c2d2661771.tar.bz2 nixlib-99075fb402505d95359aadf3993b12c2d2661771.tar.lz nixlib-99075fb402505d95359aadf3993b12c2d2661771.tar.xz nixlib-99075fb402505d95359aadf3993b12c2d2661771.tar.zst nixlib-99075fb402505d95359aadf3993b12c2d2661771.zip | |
saneBackends{,Git} -> sane-backends{,-git}
Fixes xsane evaluation.
Diffstat (limited to 'pkgs/applications/graphics/sane')
| -rw-r--r-- | pkgs/applications/graphics/sane/frontends.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/sane/xsane.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index a0f6e5bac509..d7b066220559 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, saneBackends, libX11, gtk, pkgconfig, libusb ? null}: +{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}: stdenv.mkDerivation rec { name = "sane-frontends-1.0.14"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c ''; - buildInputs = [saneBackends libX11 gtk pkgconfig] ++ + buildInputs = [sane-backends libX11 gtk pkgconfig] ++ (if libusb != null then [libusb] else []); meta = { diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 9bca047a7cf1..85b23e3c2f2c 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng +{ stdenv, fetchurl, sane-backends, saneFrontends, libX11, gtk, pkgconfig, libpng , libusb ? null , gimpSupport ? false, gimp_2_8 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] + buildInputs = [libpng sane-backends saneFrontends libX11 gtk pkgconfig ] ++ (if libusb != null then [libusb] else []) ++ stdenv.lib.optional gimpSupport gimp_2_8; |