diff options
| author | Kirill Boltaev <aske@fmap.me> | 2016-09-13 20:42:55 +0300 |
|---|---|---|
| committer | Kirill Boltaev <aske@fmap.me> | 2016-09-13 21:09:24 +0300 |
| commit | 0f37287df5c4ba0343c292ddfe827224efa87daf (patch) | |
| tree | ce3a7a0659c5c478cb75c96c93051b83532a8d9b /pkgs/development/compilers/gcc/5 | |
| parent | 4b55b0358ad7c636b581bb8b665540f013ef68af (diff) | |
| download | nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar.gz nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar.bz2 nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar.lz nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar.xz nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.tar.zst nixlib-0f37287df5c4ba0343c292ddfe827224efa87daf.zip | |
treewide: explicitly specify gtk version
Diffstat (limited to 'pkgs/development/compilers/gcc/5')
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 74f7f37e7f30..f5c69d24d63e 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -16,7 +16,7 @@ , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -207,7 +207,7 @@ let version = "5.4.0"; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -295,7 +295,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) |