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

cross: mark tangram, gnome-online-accounts as needs binfmt

Browse Source
This commit is contained in:
Colin 2023-11-25 06:27:20 +00:00
parent 58f17eac2d
commit 6a9b8b558a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
overlays/cross.nix
View File

@ -733,6 +733,9 @@ in {
# final.gobject-introspection # this *should* work, if libgnome-games-support were to ship GIR bindings? # final.gobject-introspection # this *should* work, if libgnome-games-support were to ship GIR bindings?
] prev.gnome-2048; ] prev.gnome-2048;
# needs binfmt: "scangobj.py:execute_command:1293:WARNING:Running scanner failed: [Errno 8] Exec format error: './goa-scan', command: ./goa-scan"
gnome-online-accounts = needsBinfmt prev.gnome-online-accounts;
gnome = prev.gnome.overrideScope' (self: super: { gnome = prev.gnome.overrideScope' (self: super: {
# dconf-editor = super.dconf-editor.override { # dconf-editor = super.dconf-editor.override {
# # fails to fix original error # # fails to fix original error
@ -2014,7 +2017,8 @@ in {
# doCheck = false; # tests time out # doCheck = false; # tests time out
# }; # };
# }; # };
tangram = (prev.tangram.override { # needs binfmt: "/build/source/src/../troll/gjspack/bin/gjspack: line 3: import: not found"
tangram = needsBinfmt ((prev.tangram.override {
# N.B. blueprint-compiler is in nativeBuildInputs. # N.B. blueprint-compiler is in nativeBuildInputs.
# the trick here is to force the aarch64 versions to be used during build (via emulation). # the trick here is to force the aarch64 versions to be used during build (via emulation).
# blueprint-compiler override shared with flare-signal-nixified. # blueprint-compiler override shared with flare-signal-nixified.
@ -2039,7 +2043,7 @@ in {
''; '';
# buildInputs = upstream.buildInputs ++ [ final.gobject-introspection ]; # buildInputs = upstream.buildInputs ++ [ final.gobject-introspection ];
# nativeBuildInputs = lib.remove final.gobject-introspection upstream.nativeBuildInputs; # nativeBuildInputs = lib.remove final.gobject-introspection upstream.nativeBuildInputs;
}); }));
# tangram = (mvToBuildInputs [ final.blueprint-compiler final.gobject-introspection ] prev.tangram).overrideAttrs (upstream: { # tangram = (mvToBuildInputs [ final.blueprint-compiler final.gobject-introspection ] prev.tangram).overrideAttrs (upstream: {
# postPatch = (upstream.postPatch or "") + '' # postPatch = (upstream.postPatch or "") + ''
# substituteInPlace src/meson.build \ # substituteInPlace src/meson.build \