openjdk: remove gnome_vfs & GConf

Those libraries have been deprecated for 10+ years and require daemons
that no-one has running these days.

Keep the `enableGnome2` argument for BC.
This commit is contained in:
Jan Tojnar
2024-06-26 10:28:29 +02:00
parent 2893f56de0
commit dbd9745e11
14 changed files with 38 additions and 48 deletions
+3 -3
View File
@@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -34,7 +34,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -88,7 +88,7 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -31,7 +31,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -84,7 +84,7 @@ let
NIX_LDFLAGS = lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
];
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -31,7 +31,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -89,7 +89,7 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -31,7 +31,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -84,7 +84,7 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -34,7 +34,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -86,7 +86,7 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -36,7 +36,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -91,7 +91,7 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -35,7 +35,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -108,7 +108,7 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -35,7 +35,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -99,7 +99,7 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -8,7 +8,7 @@
# which should be fixable, this is a no-rebuild workaround for GHC.
, headless ? stdenv.targetPlatform.isGhcjs
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -40,7 +40,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -110,7 +110,7 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -8,7 +8,7 @@
# which should be fixable, this is a no-rebuild workaround for GHC.
, headless ? stdenv.targetPlatform.isGhcjs
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -38,7 +38,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -108,7 +108,7 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -8,7 +8,7 @@
# which should be fixable, this is a no-rebuild workaround for GHC.
, headless ? stdenv.targetPlatform.isGhcjs
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, glib
}:
let
@@ -38,7 +38,7 @@ let
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
gtk3 glib
];
patches = [
@@ -102,7 +102,7 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
@@ -40,9 +40,7 @@
, openjfx
, enableGnome2 ? true
, gtk3
, gnome_vfs
, glib
, GConf
, writeShellScript
}:
@@ -103,8 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3
gnome_vfs
GConf
glib
];
@@ -176,8 +172,6 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3"
"-lgio-2.0"
"-lgnomevfs-2"
"-lgconf-2"
]);
# -j flag is explicitly rejected by the build system:
+3 -3
View File
@@ -5,7 +5,7 @@
, openjdk8-bootstrap
, setJavaClassPath
, headless ? false
, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk2, glib
}:
let
@@ -44,7 +44,7 @@ let
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk2 gnome_vfs GConf glib
gtk2 glib
];
patches = [
@@ -97,7 +97,7 @@ let
NIX_LDFLAGS= toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
"-lgtk-x11-2.0" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:
+2 -6
View File
@@ -16,11 +16,7 @@ in {
compiler = let
gnomeArgs = {
inherit (gnome2) GConf gnome_vfs;
};
bootstrapArgs = gnomeArgs // {
bootstrapArgs = {
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
@@ -62,7 +58,7 @@ in {
in openjdk // { headless = openjdk; };
mkOpenjdkLinuxOnly = path-linux: args: let
openjdk = callPackage path-linux (gnomeArgs // args);
openjdk = callPackage path-linux (args);
in assert stdenv.isLinux; openjdk // {
headless = openjdk.override { headless = true; };
};