cross compilation: get gnome-shell to build
This commit is contained in:
parent
0abbd006fc
commit
9305566330
|
@ -434,7 +434,6 @@ in
|
||||||
|
|
||||||
gnome = prev.gnome.overrideScope' (self: super: {
|
gnome = prev.gnome.overrideScope' (self: super: {
|
||||||
inherit (emulated.gnome)
|
inherit (emulated.gnome)
|
||||||
gnome-shell # "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"
|
|
||||||
;
|
;
|
||||||
# dconf-editor = super.dconf-editor.override {
|
# dconf-editor = super.dconf-editor.override {
|
||||||
# # fails to fix original error
|
# # fails to fix original error
|
||||||
|
@ -521,13 +520,29 @@ in
|
||||||
# # "-Dgtk_doc=${lib.boolToString (prev.stdenv.buildPlatform == prev.stdenv.hostPlatform)}"
|
# # "-Dgtk_doc=${lib.boolToString (prev.stdenv.buildPlatform == prev.stdenv.hostPlatform)}"
|
||||||
# # ];
|
# # ];
|
||||||
# });
|
# });
|
||||||
# gnome-shell = super.gnome-shell.override {
|
gnome-shell = (super.gnome-shell.override {
|
||||||
# inherit (next) stdenv;
|
inherit (next) stdenv;
|
||||||
# };
|
}).overrideAttrs (upstream: {
|
||||||
# gnome-shell = super.gnome-shell.overrideAttrs (orig: {
|
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||||
# # does not solve original error
|
next.gjs # fixes "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"
|
||||||
# nativeBuildInputs = orig.nativeBuildInputs ++ [ next.mesonEmulatorHook ];
|
next.buildPackages.gobject-introspection # fixes "shew| Build-time dependency gobject-introspection-1.0 found: NO"
|
||||||
# });
|
];
|
||||||
|
buildInputs = lib.remove next.gobject-introspection upstream.buildInputs;
|
||||||
|
# try to reduce gobject-introspection/shew dependencies
|
||||||
|
mesonFlags = [
|
||||||
|
"-Dextensions_app=false"
|
||||||
|
"-Dextensions_tool=false"
|
||||||
|
"-Dman=false"
|
||||||
|
"-Dgtk_doc=false"
|
||||||
|
];
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
|
postPatch = upstream.postPatch or "" + ''
|
||||||
|
# disable introspection for the gvc (libgnome-volume-control) subproject
|
||||||
|
# to remove its dependency on gobject-introspection
|
||||||
|
sed -i s/introspection=true/introspection=false/ meson.build
|
||||||
|
sed -i 's/libgvc_gir/# libgvc_gir/' meson.build src/meson.build
|
||||||
|
'';
|
||||||
|
});
|
||||||
# gnome-settings-daemon = super.gnome-settings-daemon.overrideAttrs (orig: {
|
# gnome-settings-daemon = super.gnome-settings-daemon.overrideAttrs (orig: {
|
||||||
# # does not fix original error
|
# # does not fix original error
|
||||||
# nativeBuildInputs = orig.nativeBuildInputs ++ [ next.mesonEmulatorHook ];
|
# nativeBuildInputs = orig.nativeBuildInputs ++ [ next.mesonEmulatorHook ];
|
||||||
|
@ -562,13 +577,15 @@ in
|
||||||
nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib ];
|
nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib ];
|
||||||
});
|
});
|
||||||
mutter = super.mutter.overrideAttrs (orig: {
|
mutter = super.mutter.overrideAttrs (orig: {
|
||||||
# buildInputs += [next.mesa] fixes "meson.build:237:2: ERROR: Dependency "gbm" not found, tried pkgconfig"
|
nativeBuildInputs = orig.nativeBuildInputs ++ [
|
||||||
# buildInputs += [next.glib] fixes "clutter/clutter/meson.build:281:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable"
|
next.glib # fixes "clutter/clutter/meson.build:281:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable"
|
||||||
# introspection=false and remove docs=true fixes gobject-introspection/_giscanner import error
|
next.buildPackages.gobject-introspection # allows to build without forcing `introspection=false` (which would break gnome-shell)
|
||||||
nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib next.wayland-scanner ];
|
next.wayland-scanner
|
||||||
buildInputs = orig.buildInputs ++ [ next.mesa ];
|
];
|
||||||
mesonFlags = (lib.remove "-Ddocs=true" orig.mesonFlags)
|
buildInputs = orig.buildInputs ++ [
|
||||||
++ [ "-Dintrospection=false" ];
|
next.mesa # fixes "meson.build:237:2: ERROR: Dependency "gbm" not found, tried pkgconfig"
|
||||||
|
];
|
||||||
|
mesonFlags = lib.remove "-Ddocs=true" orig.mesonFlags;
|
||||||
outputs = lib.remove "devdoc" orig.outputs;
|
outputs = lib.remove "devdoc" orig.outputs;
|
||||||
});
|
});
|
||||||
# nautilus = super.nautilus.override {
|
# nautilus = super.nautilus.override {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user