diff options
| author | Kirill Boltaev <aske@fmap.me> | 2016-09-12 00:24:51 +0300 |
|---|---|---|
| committer | Kirill Boltaev <aske@fmap.me> | 2016-09-12 18:26:06 +0300 |
| commit | bccd75094fd5108b3d834ad3a86e056eed3b0337 (patch) | |
| tree | 8954184c0376ef2f8218b7df7049edde7ef6a49b /pkgs/applications/graphics/sane | |
| parent | 30107249b1a5681771591cd65aa4f1c98f4cb023 (diff) | |
| download | nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.gz nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.bz2 nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.lz nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.xz nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.zst nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.zip | |
treewide: explicitly specify gtk and related package versions
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 b5abe34581a..bd19ef3c43b 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}: +{ stdenv, fetchurl, sane-backends, libX11, gtk2, 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 = [sane-backends libX11 gtk pkgconfig] ++ + buildInputs = [sane-backends libX11 gtk2 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 b3a432c96df..de07a4f1a89 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng +{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng , libusb ? null , gimpSupport ? false, gimp_2_8 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ] + buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ] ++ (if libusb != null then [libusb] else []) ++ stdenv.lib.optional gimpSupport gimp_2_8; |