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

cross: waybar: build without binfmt/qemu

Browse Source
This commit is contained in:
Colin
2023-12-04 08:57:57 +00:00
parent 89286be9e1
commit 9bd684a971
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
overlays/cross.nix
View File

@@ -2215,17 +2215,28 @@ in with final; {
# 2023/11/21: upstreaming is blocked on wlroots # 2023/11/21: upstreaming is blocked on wlroots
# needs binfmt: "meson.build:420:8: ERROR: Dependency lookup for scdoc with method 'pkgconfig' failed: Pkg-config binary for machine 0 not found. Giving up." # needs binfmt: "meson.build:420:8: ERROR: Dependency lookup for scdoc with method 'pkgconfig' failed: Pkg-config binary for machine 0 not found. Giving up."
waybar = needsBinfmt ((prev.waybar.override { waybar = (prev.waybar.override {
runTests = false; runTests = false;
cavaSupport = false; # doesn't cross compile cavaSupport = false; # doesn't cross compile
hyprlandSupport = false; # doesn't cross compile hyprlandSupport = false; # doesn't cross compile
# hopefully fixes: "/nix/store/sc1pz0zaqwpai24zh7xx0brjinflmc6v-aarch64-unknown-linux-gnu-binutils-2.40/bin/aarch64-unknown-linux-gnu-ld: /nix/store/ghxl1zrfnvh69dmv7xa1swcbyx06va4y-wayland-1.22.0/lib/libwayland-client.so: error adding symbols: file in wrong format" # fixes: "/nix/store/sc1pz0zaqwpai24zh7xx0brjinflmc6v-aarch64-unknown-linux-gnu-binutils-2.40/bin/aarch64-unknown-linux-gnu-ld: /nix/store/ghxl1zrfnvh69dmv7xa1swcbyx06va4y-wayland-1.22.0/lib/libwayland-client.so: error adding symbols: file in wrong format"
wrapGAppsHook = wrapGAppsHook.override { wrapGAppsHook = wrapGAppsHook.override {
isGraphical = false; isGraphical = false;
# tries to invoke the pkgsHostHost compiler :s
makeWrapper = null;
}; };
}).overrideAttrs (upstream: { }).overrideAttrs (upstream: {
depsBuildBuild = upstream.depsBuildBuild or [] ++ [ pkg-config ]; nativeBuildInputs = upstream.nativeBuildInputs ++ [
})); buildPackages.wayland-scanner
(makeShellWrapper.overrideAttrs (_: {
shell = runtimeShell;
}))
];
mesonFlags = upstream.mesonFlags ++ [
# fixes "Dependency lookup for scdoc with method 'pkgconfig' failed: Pkg-config binary for machine 0 not found. Giving up."
"-Dman-pages=disabled"
];
});
webkitgtk = prev.webkitgtk.overrideAttrs (upstream: { webkitgtk = prev.webkitgtk.overrideAttrs (upstream: {
# fixes "wayland-scanner: line 5: syntax error: unterminated quoted string" # fixes "wayland-scanner: line 5: syntax error: unterminated quoted string"