Skip to content

Commit fad7119

Browse files
authored
Merge pull request #1421 from soopyc/apple-t2/update-option
apple/t2: migrate renamed option
2 parents 113cd39 + 05fa89d commit fad7119

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

apple/t2/default.nix

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
let
99
inherit (lib) types;
10+
nixosVersion = lib.versions.majorMinor lib.version;
11+
1012
audioFiles = pkgs.fetchFromGitHub {
1113
owner = "kekrby";
1214
repo = "t2-better-audio";
@@ -82,8 +84,6 @@ in
8284
"iommu=pt"
8385
];
8486

85-
hardware.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
86-
8787
services.pipewire.package = pipewirePackage;
8888
services.pipewire.wireplumber.package = pkgs.wireplumber.override {
8989
pipewire = pipewirePackage;
@@ -92,6 +92,13 @@ in
9292
# Make sure post-resume.service exists
9393
powerManagement.enable = true;
9494
}
95+
96+
(if lib.versionAtLeast nixosVersion "25.05" then {
97+
services.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
98+
} else {
99+
hardware.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
100+
})
101+
95102
(lib.mkIf t2Cfg.enableIGPU {
96103
# Enable the iGPU by default if present
97104
environment.etc."modprobe.d/apple-gmux.conf".text = ''

0 commit comments

Comments
 (0)