colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross compilation: libgweather: build with vala (dependents need it)

Browse Source
This commit is contained in:
Colin 2023-02-28 07:15:34 +00:00
parent 7a67f3ed0f
commit f1709c0355
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hosts/common/cross.nix
View File

@ -690,21 +690,14 @@ in
# fixes: "failed to produce output path for output 'devdoc'" # fixes: "failed to produce output path for output 'devdoc'"
outputs = lib.remove "devdoc" upstream.outputs; outputs = lib.remove "devdoc" upstream.outputs;
}); });
libgweather = prev.libgweather.overrideAttrs (upstream: { libgweather = (prev.libgweather.override {
# fixes: "Run-time dependency vapigen found: NO (tried pkgconfig)" # alternative to emulating python3 is to specify it in `buildInputs` instead of `nativeBuildInputs` (upstream),
mesonFlags = # but presumably that's just a different way to emulate it.
( inherit (emulated)
lib.remove "-Denable_vala=true" stdenv # fixes "Run-time dependency vapigen found: NO (tried pkgconfig)"
(lib.remove "-Dgtk_doc=true" upstream.mesonFlags) gobject-introspection # fixes gir x86-64 python -> aarch64 shared object import
) ++ [ python3 # fixes build-aux/meson/gen_locations_variant.py x86-64 python -> aarch64 import of glib
"-Dintrospection=false" ;
"-Denable_vala=false"
"-Dgtk_doc=false"
];
outputs = lib.remove "devdoc" upstream.outputs;
nativeBuildInputs = (lib.remove next.gobject-introspection upstream.nativeBuildInputs) ++ [
next.glib
];
}); });
libHX = prev.libHX.overrideAttrs (orig: { libHX = prev.libHX.overrideAttrs (orig: {
# "Can't exec "libtoolize": No such file or directory at /nix/store/r4fvx9hazsm0rdm7s393zd5v665dsh1c-autoconf-2.71/share/autoconf/Autom4te/FileUtils.pm line 294." # "Can't exec "libtoolize": No such file or directory at /nix/store/r4fvx9hazsm0rdm7s393zd5v665dsh1c-autoconf-2.71/share/autoconf/Autom4te/FileUtils.pm line 294."