Skip to content

Commit

Permalink
gcc8: Removed X11 components, since they were only used by langJava
Browse files Browse the repository at this point in the history
  • Loading branch information
Synthetica9 committed May 3, 2018
1 parent d21ff87 commit 51ac1d8
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions pkgs/development/compilers/gcc/8/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, pkgconfig ? 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
, x11Support ? false
, enableMultilib ? false
, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
, name ? "gcc"
Expand Down Expand Up @@ -60,11 +54,6 @@ let version = "8.1.0";
}) */
++ optional langFortran ../gfortran-driving.patch;

xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto
];

/* Platform flags */
platformFlags = let
gccArch = targetPlatform.platform.gcc.arch or null;
Expand Down Expand Up @@ -150,9 +139,6 @@ let version = "8.1.0";

in

# We need all these X libraries when building AWT with GTK+.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];

stdenv.mkDerivation ({
name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;

Expand Down

0 comments on commit 51ac1d8

Please sign in to comment.