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

sway/waybar: decrease cross-specific patches 

cava cross compiles now (yay); sndio is actually required by waybar if cava is enabled, so remove the disable
This commit is contained in:
Colin 2024-02-29 18:56:54 +00:00
parent 43386f3ba5
commit 9764d5f095
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/programs/waybar/default.nix
View File

@ -51,9 +51,7 @@ in
# not *required*, however this does cut down on some cross-compilation issues
# and also avoids building entirely unused dependencies
sway = config.sane.programs.sway.package;
cavaSupport = false; #< doesn't cross
hyprlandSupport = false; #< doesn't cross
sndioSupport = false; #< useless
};
sandbox.method = "bwrap";

4
overlays/cross.nix
View File

@ -2005,7 +2005,6 @@ in with final; {
# 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 = (prev.waybar.override {
runTests = false; #< upstream expects `catch2_3` as a runtime requirement
cavaSupport = false; # doesn't cross compile
hyprlandSupport = false; # doesn't cross compile
# 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 = wrapGAppsNoGuiHook;
@ -2062,7 +2061,8 @@ in with final; {
'';
});
# 2024/02/29: upstreaming is unblocked
# 2024/02/29: upstreaming is blocked on libei (unless Xwayland config option is disabled in nixpkgs)
# implemented on pr-wlroots-cross branch
wlroots = prev.wlroots.overrideAttrs (upstream: {
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
# incorrectly specified as `buildInputs` in nixpkgs.