wireplumber-jupiter: revive at 0.5.6-jupiter1.2, steamdeck-dsp: 0.49.…

…5 -> 0.57 This reverts commit e9dda44.
Jovian-Experiments · Nov 26, 2024 · 0ee0f46 · 0ee0f46
1 parent e86d2ad
commit 0ee0f46
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/modules/devices/steamdeck/sound.nix b/modules/devices/steamdeck/sound.nix
@@ -39,6 +39,7 @@ in
       pulse.enable = true;
       alsa.enable = true;
       configPackages = [ pkgs.steamdeck-dsp ];
+      wireplumber.package = pkgs.wireplumber-jupiter;
       wireplumber.configPackages = [ pkgs.steamdeck-dsp ];
     };
 

diff --git a/overlay.nix b/overlay.nix
@@ -47,6 +47,10 @@ rec {
   steamos-manager = final.callPackage ./pkgs/steamos-manager { };
   steamos-polkit-helpers = final.callPackage ./pkgs/jupiter-hw-support/polkit-helpers.nix { };
   steamdeck-dsp = final.callPackage ./pkgs/steamdeck-dsp { };
+  wireplumber-jupiter = import ./pkgs/wireplumber {
+    wireplumber' = prev.wireplumber;
+    inherit (final) fetchFromGitHub;
+  };
 
   opensd = final.callPackage ./pkgs/opensd { };
 

diff --git a/pkgs/steamdeck-dsp/default.nix b/pkgs/steamdeck-dsp/default.nix
@@ -31,13 +31,13 @@ let
   };
   self = stdenv.mkDerivation(finalAttrs: {
     pname = "steamdeck-dsp";
-    version = "0.49.5";
+    version = "0.57";
 
     src = fetchFromGitHub {
       owner = "Jovian-Experiments";
       repo = "steamdeck-dsp";
       rev = finalAttrs.version;
-      hash = "sha256-RleDIa1E3kOCYlOdzNSfk4u0Cb4NhzP4GIJjjD6CeMA=";
+      hash = "sha256-3q86Dh6chzmZaoXE7nZH21A5GzOsVBwinxsPCsn6r+Y=";
     };
 
     nativeBuildInputs = [

diff --git a/pkgs/wireplumber/default.nix b/pkgs/wireplumber/default.nix
@@ -0,0 +1,11 @@
+{ wireplumber', fetchFromGitHub }:
+wireplumber'.overrideAttrs(_: {
+  version = "0.5.6";
+
+  src = fetchFromGitHub {
+    owner = "Jovian-Experiments";
+    repo = "wireplumber";
+    rev = "0.5.6-jupiter1.2";
+    hash = "sha256-Zq+btS/cFQ9WHpcXf5MO1e/jfZRvozrpb49W1LVNk3E=";
+  };
+})
diff --git a/support/manifest/mappings.toml b/support/manifest/mappings.toml
@@ -274,7 +274,7 @@ steam-jupiter-oobe.ignore = true
 
 steam_notif_daemon = { map = true, pkgrel = 2, fixup = "v" }
 
-steamdeck-dsp = { map = true, pkgrel = "1.1" }
+steamdeck-dsp = { map = true, pkgrel = 1 }
 
 # we don't ship those
 steamdeck-kde-presets.ignore = true
@@ -344,7 +344,7 @@ vpower.ignore = true
 
 wakehook = { map = true, pkgrel = 1 }
 
-wireplumber.check = "0.5.0-1"
+wireplumber = { map = "wireplumber-jupiter", pkgrel = "1.2" }
 
 # ours is newer
 xdg-desktop-portal-gtk.ignore = true