blueberry: patch for cross compilation, and ship it

note that this doesn't do anything yet, as i need to re-enable bluez (bluetooth.service), first
This commit is contained in:
2025-01-26 05:07:35 +00:00
parent 3f0e2c5cb2
commit 88ef815717
3 changed files with 7 additions and 2 deletions

View File

@@ -158,7 +158,7 @@ in
packageUnwrapped = swayPackage;
suggestedPrograms = [
"guiApps"
# "blueberry" # GUI bluetooth manager
"blueberry" # GUI bluetooth manager
"brightnessctl"
"conky" # for a nice background
"fcitx5" # input method; emoji. this has been known to break and glitch input into any textbox -- disable here if that happens

View File

@@ -11,7 +11,6 @@ in
config = lib.mkIf cfg.enable {
# disable the following non-essential programs which fail to cross compile
sane.programs.bash-language-server.enableFor = { system = false; user.colin = false; }; # bash neovim LSP: doesn't cross compile (2025-01-05; blocked by ShellCheck)
sane.programs.blueberry.enableFor.user.colin = false; # bluetooth manager: doesn't cross compile (2025-01-05; blocked by gnome-bluetooth)
sane.programs.fcitx5.enableFor.user.colin = false; #< does not cross compile (2025-01-05; blocked by qtsvg)
sane.programs.firefox.config.addons.browserpass-extension.enable = false; #< does not cross compile
sane.programs.lua-language-server.enableFor = { system = false; user.colin = false; }; # lua neovim LSP: doesn't cross compile (2025-01-06)

View File

@@ -46,6 +46,12 @@ in
# hash = "sha256-jW66W1V3upZMfbjuoruY3OGNJfEewx7DW/Z4vAhMEXw=";
# })
(fetchpatch' {
name = "blueberry: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/376884";
hash = "sha256-BYD9Xr9bh8xJxWEvTa2asSsaJbgTLItFsdtIH/7kq4s=";
})
(fetchpatch' {
# patch should be safe to remove; keeping it here to track the upstreaming status
name = "nixos/gitea: don't configure the database if `createDatabase == false`";