pipewire: 0.3.22 -> 0.3.23

18 files changed, 156 insertions, 253 deletions

diff --git a/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json b/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json
index 5e8e1de6986..53fc9cc9634 100644
--- a/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json
+++ b/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json
@@ -2,47 +2,33 @@
   "properties": {},
   "rules": [
     {
-      "actions": {
-        "update-props": {
-          "api": {
-            "acp": {
-              "auto-port": false,
-              "auto-profile": false
-            },
-            "alsa": {
-              "use-acp": true
-            }
-          }
-        }
-      },
       "matches": [
         {
-          "device": {
-            "name": "~alsa_card.*"
-          }
+          "device.name": "~alsa_card.*"
         }
-      ]
-    },
-    {
+      ],
       "actions": {
         "update-props": {
-          "node": {
-            "pause-on-idle": false
-          }
+          "api.alsa.use-acp": true,
+          "api.acp.auto-profile": false,
+          "api.acp.auto-port": false
         }
-      },
+      }
+    },
+    {
       "matches": [
         {
-          "node": {
-            "name": "~alsa_input.*"
-          }
+          "node.name": "~alsa_input.*"
         },
         {
-          "node": {
-            "name": "~alsa_output.*"
-          }
+          "node.name": "~alsa_output.*"
+        }
+      ],
+      "actions": {
+        "update-props": {
+          "node.pause-on-idle": false
         }
-      ]
+      }
     }
   ]
 }
diff --git a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json b/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
index d8f74f32943..4d50cb9f1ad 100644
--- a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
+++ b/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
@@ -2,37 +2,29 @@
   "properties": {},
   "rules": [
     {
-      "actions": {
-        "update-props": {}
-      },
       "matches": [
         {
-          "device": {
-            "name": "~bluez_card.*"
-          }
+          "device.name": "~bluez_card.*"
         }
-      ]
+      ],
+      "actions": {
+        "update-props": {}
+      }
     },
     {
-      "actions": {
-        "update-props": {
-          "node": {
-            "pause-on-idle": false
-          }
-        }
-      },
       "matches": [
         {
-          "node": {
-            "name": "~bluez_input.*"
-          }
+          "node.name": "~bluez_input.*"
         },
         {
-          "node": {
-            "name": "~bluez_output.*"
-          }
+          "node.name": "~bluez_output.*"
+        }
+      ],
+      "actions": {
+        "update-props": {
+          "node.pause-on-idle": false
         }
-      ]
+      }
     }
   ]
 }
diff --git a/nixos/modules/services/desktops/pipewire/client-rt.conf.json b/nixos/modules/services/desktops/pipewire/client-rt.conf.json
index 701b1916599..d294927b4f6 100644
--- a/nixos/modules/services/desktops/pipewire/client-rt.conf.json
+++ b/nixos/modules/services/desktops/pipewire/client-rt.conf.json
@@ -1,5 +1,7 @@
 {
-  "context.properties": {},
+  "context.properties": {
+    "log.level": 0
+  },
   "context.spa-libs": {
     "audio.convert.*": "audioconvert/libspa-audioconvert",
     "support.*": "support/libspa-support"
@@ -18,5 +20,7 @@
     "libpipewire-module-adapter": null,
     "libpipewire-module-metadata": null,
     "libpipewire-module-session-manager": null
-  }
+  },
+  "filter.properties": {},
+  "stream.properties": {}
 }
diff --git a/nixos/modules/services/desktops/pipewire/client.conf.json b/nixos/modules/services/desktops/pipewire/client.conf.json
index 24c10309329..224938abbbc 100644
--- a/nixos/modules/services/desktops/pipewire/client.conf.json
+++ b/nixos/modules/services/desktops/pipewire/client.conf.json
@@ -1,5 +1,7 @@
 {
-  "context.properties": {},
+  "context.properties": {
+    "log.level": 0
+  },
   "context.spa-libs": {
     "audio.convert.*": "audioconvert/libspa-audioconvert",
     "support.*": "support/libspa-support"
@@ -11,5 +13,7 @@
     "libpipewire-module-adapter": null,
     "libpipewire-module-metadata": null,
     "libpipewire-module-session-manager": null
-  }
+  },
+  "filter.properties": {},
+  "stream.properties": {}
 }
diff --git a/nixos/modules/services/desktops/pipewire/jack.conf.json b/nixos/modules/services/desktops/pipewire/jack.conf.json
index 0219269f615..2de04036b31 100644
--- a/nixos/modules/services/desktops/pipewire/jack.conf.json
+++ b/nixos/modules/services/desktops/pipewire/jack.conf.json
@@ -1,5 +1,7 @@
 {
-  "context.properties": {},
+  "context.properties": {
+    "log.level": 0
+  },
   "context.spa-libs": {
     "support.*": "support/libspa-support"
   },
diff --git a/nixos/modules/services/desktops/pipewire/media-session.conf.json b/nixos/modules/services/desktops/pipewire/media-session.conf.json
index a8fc2d93fb0..4b2505ff816 100644
--- a/nixos/modules/services/desktops/pipewire/media-session.conf.json
+++ b/nixos/modules/services/desktops/pipewire/media-session.conf.json
@@ -1,10 +1,12 @@
 {
+  "context.properties": {},
+  "context.spa-libs": {
+    "api.bluez5.*": "bluez5/libspa-bluez5",
+    "api.alsa.*": "alsa/libspa-alsa",
+    "api.v4l2.*": "v4l2/libspa-v4l2",
+    "api.libcamera.*": "libcamera/libspa-libcamera"
+  },
   "context.modules": {
-    "libpipewire-module-protocol-native": null,
-    "libpipewire-module-adapter": null,
-    "libpipewire-module-client-device": null,
-    "libpipewire-module-client-node": null,
-    "libpipewire-module-metadata": null,
     "libpipewire-module-rtkit": {
       "args": {},
       "flags": [
@@ -12,15 +14,13 @@
         "nofail"
       ]
     },
+    "libpipewire-module-protocol-native": null,
+    "libpipewire-module-client-node": null,
+    "libpipewire-module-client-device": null,
+    "libpipewire-module-adapter": null,
+    "libpipewire-module-metadata": null,
     "libpipewire-module-session-manager": null
   },
-  "context.properties": {},
-  "context.spa-libs": {
-    "api.alsa.*": "alsa/libspa-alsa",
-    "api.bluez5.*": "bluez5/libspa-bluez5",
-    "api.libcamera.*": "libcamera/libspa-libcamera",
-    "api.v4l2.*": "v4l2/libspa-v4l2"
-  },
   "session.modules": {
     "default": [
       "flatpak",
@@ -29,9 +29,6 @@
       "suspend-node",
       "policy-node"
     ],
-    "with-alsa": [
-      "with-audio"
-    ],
     "with-audio": [
       "metadata",
       "default-nodes",
@@ -40,6 +37,9 @@
       "alsa-seq",
       "alsa-monitor"
     ],
+    "with-alsa": [
+      "with-audio"
+    ],
     "with-jack": [
       "with-audio"
     ],
diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
index b324bfa1b74..b41ea349fb8 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
@@ -112,7 +112,8 @@ in {
   ###### implementation
   config = mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
-    services.pipewire.sessionManagerExecutable = builtins.unsafeDiscardStringContext "${cfg.package}/bin/pipewire-media-session";
+    systemd.packages = [ cfg.package ];
+    systemd.user.services.pipewire-media-session.wantedBy = [ "pipewire.service" ];
 
     environment.etc."pipewire/media-session.d/media-session.conf" = { text = toSPAJSON (recursiveUpdate defaults.media-session cfg.config.media-session); };
     environment.etc."pipewire/media-session.d/v4l2-monitor.conf" = { text = toSPAJSON (recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor); };
diff --git a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json b/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json
index 5fe6ec2b064..da08bcea2c9 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json
+++ b/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json
@@ -23,5 +23,6 @@
         ]
       }
     }
-  }
+  },
+  "stream.properties": {}
 }
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.conf.json b/nixos/modules/services/desktops/pipewire/pipewire.conf.json
index b8e23e04c8a..59e2afca093 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire.conf.json
+++ b/nixos/modules/services/desktops/pipewire/pipewire.conf.json
@@ -29,7 +29,12 @@
     "libpipewire-module-spa-node-factory": null,
     "libpipewire-module-client-node": null,
     "libpipewire-module-client-device": null,
-    "libpipewire-module-portal": null,
+    "libpipewire-module-portal": {
+      "flags": [
+        "ifexists",
+        "nofail"
+      ]
+    },
     "libpipewire-module-access": {
       "args": {}
     },
@@ -46,9 +51,5 @@
       }
     }
   },
-  "context.exec": {
-    "/nix/store/1q65a09arb7r4sdfz657p473kn3lqknk-pipewire-0.3.22/bin/pipewire-media-session": {
-      "args": ""
-    }
-  }
+  "context.exec": {}
 }
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix
index 77aa7043ee4..2577e77c4a1 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire.nix
@@ -20,6 +20,7 @@ let
 
   prioritizeNativeProtocol = {
     "context.modules" = {
+      # Most other modules depend on this, so put it first
       "libpipewire-module-protocol-native" = {
         _priority = -100;
         _content = null;
@@ -27,10 +28,22 @@ let
     };
   };
 
-  sessionManagerInvocation = {
-    "context.exec" = {
-      "${cfg.sessionManagerExecutable}" = {
-        args = "${lib.concatStringsSep " " cfg.sessionManagerArguments}";
+  fixDaemonModulePriorities = {
+    "context.modules" = {
+      # Most other modules depend on thism so put it first
+      "libpipewire-module-protocol-native" = {
+        _priority = -100;
+        _content = null;
+      };
+      # Needs to be before libpipewire-module-access
+      "libpipewire-module-portal" = {
+        _priority = -50;
+        _content = {
+          flags = [
+            "ifexists"
+            "nofail"
+          ];
+        };
       };
     };
   };
@@ -42,7 +55,7 @@ let
     client-rt = recursiveUpdate (builtins.fromJSON (builtins.readFile ./client-rt.conf.json)) prioritizeNativeProtocol;
     jack = recursiveUpdate (builtins.fromJSON (builtins.readFile ./jack.conf.json)) prioritizeNativeProtocol;
     # Remove session manager invocation from the upstream generated file, it points to the wrong path
-    pipewire = recursiveUpdate ((removeAttrs (builtins.fromJSON (builtins.readFile ./pipewire.conf.json)) ["context.exec"]) // sessionManagerInvocation) prioritizeNativeProtocol;
+    pipewire = recursiveUpdate (builtins.fromJSON (builtins.readFile ./pipewire.conf.json)) fixDaemonModulePriorities;
     pipewire-pulse = recursiveUpdate (builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json)) prioritizeNativeProtocol;
   };
 
@@ -140,24 +153,6 @@ in {
         };
       };
 
-      sessionManagerExecutable = mkOption {
-        type = types.str;
-        default = "";
-        example = literalExample ''${pkgs.pipewire.mediaSession}/bin/pipewire-media-session'';
-        description = ''
-          Path to the session manager executable.
-        '';
-      };
-
-      sessionManagerArguments = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        example = literalExample ''["-p" "bluez5.msbc-support=true"]'';
-        description = ''
-          Arguments passed to the pipewire session manager.
-        '';
-      };
-
       alsa = {
         enable = mkEnableOption "ALSA support";
         support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems";
diff --git a/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json b/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json
index ca404fabbfc..b08cba1b604 100644
--- a/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json
+++ b/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json
@@ -2,37 +2,29 @@
   "properties": {},
   "rules": [
     {
-      "actions": {
-        "update-props": {}
-      },
       "matches": [
         {
-          "device": {
-            "name": "~v4l2_device.*"
-          }
+          "device.name": "~v4l2_device.*"
         }
-      ]
+      ],
+      "actions": {
+        "update-props": {}
+      }
     },
     {
-      "actions": {
-        "update-props": {
-          "node": {
-            "pause-on-idle": false
-          }
-        }
-      },
       "matches": [
         {
-          "node": {
-            "name": "~v4l2_input.*"
-          }
+          "node.name": "~v4l2_input.*"
         },
         {
-          "node": {
-            "name": "~v4l2_output.*"
-          }
+          "node.name": "~v4l2_output.*"
+        }
+      ],
+      "actions": {
+        "update-props": {
+          "node.pause-on-idle": false
         }
-      ]
+      }
     }
   ]
 }
diff --git a/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch b/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch
index c657d12f7d0..c657d12f7d0 100644
--- a/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch
+++ b/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch
diff --git a/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch b/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch
index 99782e1bb21..4a6b21dd431 100644
--- a/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch
+++ b/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch
@@ -1,19 +1,19 @@
 diff --git a/meson_options.txt b/meson_options.txt
-index 050a4c31..c481e76c 100644
+index ce364d93..a6c8af72 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -148,6 +148,9 @@ option('udev',
+@@ -152,6 +152,9 @@ option('udev',
  option('udevrulesdir',
         type : 'string',
         description : 'Directory for udev rules (defaults to /lib/udev/rules.d)')
 +option('pipewire_pulse_prefix',
 +       type : 'string',
-+       description : 'Install directory for the pipewire-pulse daemon')
++       description: 'Install directory for the pipewire-pulse daemon')
  option('systemd-user-unit-dir',
         type : 'string',
         description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)')
 diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
-index 46dfbbc8..0d975cec 100644
+index 0a5e5042..4a70b0b0 100644
 --- a/src/daemon/systemd/user/meson.build
 +++ b/src/daemon/systemd/user/meson.build
 @@ -9,7 +9,7 @@ install_data(
@@ -22,6 +22,6 @@ index 46dfbbc8..0d975cec 100644
  systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
 -systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse'))
 +systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse'))
+ systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))
  
  configure_file(input : 'pipewire.service.in',
-                output : 'pipewire.service',
diff --git a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch
new file mode 100644
index 00000000000..ce1085f37f7
--- /dev/null
+++ b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch
@@ -0,0 +1,27 @@
+diff --git a/meson_options.txt b/meson_options.txt
+index a6c8af72..8e5c3d73 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -10,6 +10,9 @@ option('media-session',
+        description: 'Build and install pipewire-media-session',
+        type: 'boolean',
+        value: true)
++option('media-session-prefix',
++       description: 'Install directory for pipewire-media-session and its support files',
++       type: 'string')
+ option('man',
+        description: 'Build manpages',
+        type: 'boolean',
+diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
+index 4a70b0b0..84c9a19e 100644
+--- a/src/daemon/systemd/user/meson.build
++++ b/src/daemon/systemd/user/meson.build
+@@ -10,7 +10,7 @@ install_data(
+ systemd_config = configuration_data()
+ systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
+ systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse'))
+-systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))
++systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(get_option('media-session-prefix'), 'bin/pipewire-media-session'))
+
+ configure_file(input : 'pipewire.service.in',
+                output : 'pipewire.service',
diff --git a/pkgs/development/libraries/pipewire/installed-tests-path.patch b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch
index 2a92711626b..2a92711626b 100644
--- a/pkgs/development/libraries/pipewire/installed-tests-path.patch
+++ b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch
diff --git a/pkgs/development/libraries/pipewire/pipewire-config-dir.patch b/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch
index ad1ae93684b..ad1ae93684b 100644
--- a/pkgs/development/libraries/pipewire/pipewire-config-dir.patch
+++ b/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 8dd94f4ba13..5c5578abc8d 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -43,7 +43,7 @@ let
 
   self = stdenv.mkDerivation rec {
     pname = "pipewire";
-    version = "0.3.22";
+    version = "0.3.23";
 
     outputs = [
       "out"
@@ -61,106 +61,20 @@ let
       owner = "pipewire";
       repo = "pipewire";
       rev = version;
-      hash = "sha256:6SEOUivyehccVR5zt79Qw2rjN2KcO5x3TEejXVxRlvs=";
+      hash = "sha256:1HMUrE1NBmrdBRMKX3LRlXaCEH3wqP2jGtW8Rp9oyQA=";
     };
 
     patches = [
       # Break up a dependency cycle between outputs.
-      ./alsa-profiles-use-libdir.patch
-      # Move installed tests into their own output.
-      ./installed-tests-path.patch
+      ./0040-alsa-profiles-use-libdir.patch
       # Change the path of the pipewire-pulse binary in the service definition.
-      ./pipewire-pulse-path.patch
+      ./0050-pipewire-pulse-path.patch
+      # Change the path of the pipewire-media-session binary in the service definition.
+      ./0055-pipewire-media-session-path.patch
+      # Move installed tests into their own output.
+      ./0070-installed-tests-path.patch
       # Add flag to specify configuration directory (different from the installation directory).
-      ./pipewire-config-dir.patch
-
-      # Various quality of life improvements that didn't make it into 0.3.22
-      (fetchpatch {
-        name = "0001-bluez5-include-a2dp-codec-profiles-in-route-profiles.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/df1dbee687c819095a6fddce3b24943f9ac47dbc.patch";
-        sha256 = "sha256-MesteaIcfKMr53TdObEfqRyKEgalB1GEWpsTexawPgg=";
-      })
-      (fetchpatch {
-        name = "0001-pulse-server-don-t-use-the-pending_sample-after-free.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/72acd752f68a35c40641262be1c69014170d0734.patch";
-        sha256 = "sha256-F3+aVfOYH4SLTwWhdIKuNUo85NBoS+67vkUrcsaldSs=";
-      })
-      ./patches-0.3.22/0005-fix-some-warnings.patch
-      (fetchpatch {
-        name = "0006-spa-escape-double-quotes.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/6a219092818a7a7e357441256d8070ae77ac2d3a.patch";
-        sha256 = "sha256-NUjxOSthe3Jw2LUrO11QnTWTx0PQNBJkQSv3ux58jZw=";
-      })
-      (fetchpatch {
-        name = "0009-bluez5-volumes-need-to-be-distributed-to-all-channel.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/8c5ca000ef7fddd9be9cd2211d880736e97b956d.patch";
-        sha256 = "sha256-9NhbYSXlNOYmoPg8tj561QHisaD216fBG7ccNIfoZ64=";
-      })
-      (fetchpatch {
-        name = "0010-bluez5-set-the-right-volumes-on-the-node.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/930b411075a5c1b0d9ddcfe7dd2dbfdc27baab90.patch";
-        sha256 = "sha256-xsL92H8wSrBzoxLtraCVxPZdXWTwj+j+O2XlfhcJ7IQ=";
-      })
-      (fetchpatch {
-        name = "0011-bluez5-backend-native-Check-volume-values.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/7a5a94470453e0cbd3a087b1be2aa8960ff43c07.patch";
-        sha256 = "sha256-HKWcfkwMmmlEB7l+SETJDsUZ2eLggcodtbNOpqY/wWY=";
-      })
-      (fetchpatch {
-        name = "0012-media-session-don-t-switch-to-pro-audio-by-default.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/84fc63e60168e2c2f43875423899b4ae3bd89a7b.patch";
-        sha256 = "sha256-tZwgBMZS+HJd0lrRji3aevbP/yJfvWYK60KMpfiFrOY=";
-      })
-      (fetchpatch {
-        name = "0013-audioconvert-keep-better-track-of-param-changes.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/44919c83fc51aa5e1a22c903e841897c1b4d274c.patch";
-        sha256 = "sha256-DIZUfEjUCaK4yY3k7/KLHv1igTKz6Ek4QbWECs1sr9E=";
-      })
-      (fetchpatch {
-        name = "0018-pulse-server-print-encoding-name-in-format_info.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/4b591df145afa316e8e047764f9b98fc10cbacd9.patch";
-        sha256 = "sha256-Dr6w6tI4R+6wrl0rVk9Eifw3YleuisVmXzsv+H2jtXc=";
-      })
-      (fetchpatch {
-        name = "0019-pulse-server-handle-unsupported-formats.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/fcf00b3d352d931446a384a768b999520662b599.patch";
-        sha256 = "sha256-kQ3vRoojLVTOJi8V4eODkZC8agsla2PjKf6sJnm/1C4=";
-      })
-      (fetchpatch {
-        name = "0021-jack-handle-client-init-error-with-EIO.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/715a3a642a4f1c1f624e0a9dc0394b1819b69f93.patch";
-        sha256 = "sha256-DglHcH9pHSWuVxZuLt8J+gDmxOaQSoiThVE2wePfH1I=";
-      })
-      (fetchpatch {
-        name = "0022-pw-cli-always-output-to-stdout.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/91875c1fd8ece6b1b94130c50304b715654f8681.patch";
-        sha256 = "sha256-3Sf/Tr39bdBihq/CFborm7GcBWtSvqO3KtRtFBcHcmc=";
-      })
-      (fetchpatch {
-        name = "0024-policy-node-don-t-crash-without-metadata.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/3673265ae20d7b59e89cad6c5238c232796731b2.patch";
-        sha256 = "sha256-YRdh1gqBYqa+sbSfHuJZ+Xc6w4QTOOpt/fppFNxsj+8=";
-      })
-      (fetchpatch {
-        name = "0025-bluez5-route-shouldn-t-list-a2dp-profiles-when-not-c.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/a5dc2493dfccfc168cef01162f38f90e986b8af4.patch";
-        sha256 = "sha256-zu7zqHIMOcxLAhvelKNWDB+804x+ocCo5FAMUSSOnVo=";
-      })
-      (fetchpatch {
-        name = "0027-jack-apply-PIPEWIRE_PROPS-after-reading-config.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/149319819aa5d4e39770c35a0c00f6c2963e2bf3.patch";
-        sha256 = "sha256-SwKQJkg8NIL9D0GAL6hnEgi8kvuToo1bpDm52adtKxA=";
-      })
-      (fetchpatch {
-        name = "0038-jack-add-config-option-to-shorten-and-filter-names.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/d54da879bf5f9fa9009e1ab27e8d52eae3141764.patch";
-        sha256 = "sha256-iYOmZTWNODHYWpYGfRTQhBLV1HeFOUvHN3Ta0f1ZS8M=";
-      })
-      (fetchpatch {
-        name = "0046-jack-fix-names-of-our-ports.patch";
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/e340a44a357e4550e169bc8825c6aa8b4ceb76db.patch";
-        sha256 = "sha256-rfv2IzgYyNB1s51eRFhJzZCyso6PIEj2qg9fpPpOZ5Q=";
-      })
+      ./0080-pipewire-config-dir.patch
     ];
 
     nativeBuildInputs = [
@@ -196,6 +110,7 @@ let
       "-Dinstalled_tests=true"
       "-Dinstalled_test_prefix=${placeholder "installedTests"}"
       "-Dpipewire_pulse_prefix=${placeholder "pulse"}"
+      "-Dmedia-session-prefix=${placeholder "mediaSession"}"
       "-Dlibjack-path=${placeholder "jack"}/lib"
       "-Dgstreamer=${mesonBool gstreamerSupport}"
       "-Dffmpeg=${mesonBool ffmpegSupport}"
@@ -212,17 +127,23 @@ let
     doCheck = true;
 
     postInstall = ''
-      mkdir -p $out/nix-support/etc/pipewire/media-session.
-      for f in etc/pipewire/*.conf; do $out/bin/spa-json-dump "$f" > "$out/nix-support/$f.json"; done
+      pushd .
+      cd $out
+      mkdir -p $out/nix-support/etc/pipewire
+      for f in etc/pipewire/*.conf; do bin/spa-json-dump "$f" > "$out/nix-support/$f.json"; done
+
+      mkdir -p $mediaSession/nix-support/etc/pipewire/media-session.d
+      for f in etc/pipewire/media-session.d/*.conf; do bin/spa-json-dump "$f" > "$mediaSession/nix-support/$f.json"; done
+      popd
+
+      moveToOutput "etc/pipewire/media-session.d/*.conf" "$mediaSession"
+      moveToOutput "share/systemd/user/pipewire-media-session.*" "$mediaSession"
+      moveToOutput "lib/systemd/user/pipewire-media-session.*" "$mediaSession"
+      moveToOutput "bin/pipewire-media-session" "$mediaSession"
 
       moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse"
       moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse"
       moveToOutput "bin/pipewire-pulse" "$pulse"
-
-      mkdir -p $mediaSession/nix-support/etc/pipewire/media-session.d
-      for f in etc/pipewire/media-session.d/*.conf; do $out/bin/spa-json-dump "$f" > "$mediaSession/nix-support/$f.json"; done
-      moveToOutput "bin/pipewire-media-session" "$mediaSession"
-      moveToOutput "etc/pipewire/media-session.d/*.conf" "$mediaSession"
     '';
 
     passthru.tests = {
diff --git a/pkgs/development/libraries/pipewire/patches-0.3.22/0005-fix-some-warnings.patch b/pkgs/development/libraries/pipewire/patches-0.3.22/0005-fix-some-warnings.patch
deleted file mode 100644
index 56987bf4d1d..00000000000
--- a/pkgs/development/libraries/pipewire/patches-0.3.22/0005-fix-some-warnings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 63a3811aa76802e9585e04cf12bf8de617442105 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 18 Feb 2021 12:42:06 +0100
-Subject: [PATCH 05/30] fix some warnings
-
----
- spa/plugins/bluez5/backend-native.c         |  2 +-
- src/examples/media-session/default-routes.c | 18 +++++++++++++-----
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/spa/plugins/bluez5/backend-native.c b/spa/plugins/bluez5/backend-native.c
-index 4df714088..b4d4e5edf 100644
---- a/spa/plugins/bluez5/backend-native.c
-+++ b/spa/plugins/bluez5/backend-native.c
-@@ -437,7 +437,7 @@ static bool rfcomm_hfp_hf(struct spa_source *source, char* buf)
- 	struct rfcomm *rfcomm = source->data;
- 	struct spa_bt_backend *backend = rfcomm->backend;
- 	unsigned int features;
--	unsigned int gain;
-+	unsigned int SPA_UNUSED gain;
- 	unsigned int selected_codec;
- 	char* token;
- 	char separators[] = "\r\n:";