diff options
Diffstat (limited to 'modules/nixos-apple-silicon/apple-silicon-support')
-rw-r--r-- | modules/nixos-apple-silicon/apple-silicon-support/modules/sound/default.nix | 15 | ||||
-rw-r--r-- | modules/nixos-apple-silicon/apple-silicon-support/packages/linux-asahi/default.nix | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/modules/nixos-apple-silicon/apple-silicon-support/modules/sound/default.nix b/modules/nixos-apple-silicon/apple-silicon-support/modules/sound/default.nix index d76e7138d4c9..d0928b0ca348 100644 --- a/modules/nixos-apple-silicon/apple-silicon-support/modules/sound/default.nix +++ b/modules/nixos-apple-silicon/apple-silicon-support/modules/sound/default.nix @@ -65,6 +65,21 @@ "lsp-plugins is unpatched/outdated and speakers cannot be safely enabled" [ pkgs.speakersafetyd ]; services.udev.packages = [ pkgs.speakersafetyd ]; + + # downgrade wireplumber to a version compatible with the asahi-audio configs + nixpkgs.overlays = [(final: prev: { + wireplumber = prev.wireplumber.overrideAttrs (old: + lib.optionalAttrs (lib.versionAtLeast old.version "0.5.0") rec { + version = "0.4.17"; + src = final.fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "wireplumber"; + rev = version; + hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; + }; + }); + })]; } (lib.optionalAttrs newHotness { # use configPackages and friends to install asahi-audio and plugins diff --git a/modules/nixos-apple-silicon/apple-silicon-support/packages/linux-asahi/default.nix b/modules/nixos-apple-silicon/apple-silicon-support/packages/linux-asahi/default.nix index bb9a05466655..2f1d490277be 100644 --- a/modules/nixos-apple-silicon/apple-silicon-support/packages/linux-asahi/default.nix +++ b/modules/nixos-apple-silicon/apple-silicon-support/packages/linux-asahi/default.nix @@ -95,8 +95,8 @@ let # tracking: https://github.com/AsahiLinux/linux/tree/asahi-wip (w/ fedora verification) owner = "AsahiLinux"; repo = "linux"; - rev = "asahi-6.6-15"; - hash = "sha256-Jm7wTKWuwd/6ZN0g5F4CNNETiOyGQL31hfSyTDYH85k="; + rev = "asahi-6.6-16"; + hash = "sha256-73ye5JE3YKRgrxGfdQN0+YMIVO1QAJeDuUjTcFhcwI0="; }; kernelPatches = [ |