pyrox.dev
Merge pull request #7075 from oxij/x11support-gcc
gcc 4.8: add x11Support option so that it would stop evaluating gtk by default
+5
-3
pkgs/development/compilers/gcc/4.8/default.nix
+5
-3
pkgs/development/compilers/gcc/4.8/default.nix
···
15
15
, libelf # optional, for link-time optimizations (LTO)
16
16
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
17
17
, zlib ? null, boehmgc ? null
18
-
, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
18
+
, zip ? null, unzip ? null, pkgconfig ? null
19
+
, gtk ? null, libart_lgpl ? null
19
20
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
20
21
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
21
22
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
23
+
, x11Support ? langJava
22
24
, gnatboot ? null
23
25
, enableMultilib ? false
24
26
, enablePlugin ? true # whether to support user-supplied plug-ins
···
91
93
xproto renderproto xextproto inputproto randrproto
92
94
];
93
95
94
-
javaAwtGtk = langJava && gtk != null;
96
+
javaAwtGtk = langJava && x11Support;
95
97
96
98
/* Platform flags */
97
99
platformFlags = let
···
200
202
in
201
203
202
204
# We need all these X libraries when building AWT with GTK+.
203
-
assert gtk != null -> (filter (x: x == null) xlibs) == [];
205
+
assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [];
204
206
205
207
stdenv.mkDerivation ({
206
208
name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;