staging-next 2025-03-03 (#386822)

Author: vcunat

nixos/modules/services/desktops/pipewire/pipewire.nix

@@ -58,15 +58,12 @@ let
 
   configPackages = cfg.configPackages;
 
-  extraConfigPkg =
-    extraConfigPkgFromFiles [ "pipewire" "client" "client-rt" "jack" "pipewire-pulse" ]
-      (
-        mapToFiles "pipewire" cfg.extraConfig.pipewire
-        // mapToFiles "client" cfg.extraConfig.client
-        // mapToFiles "client-rt" cfg.extraConfig.client-rt
-        // mapToFiles "jack" cfg.extraConfig.jack
-        // mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse
-      );
+  extraConfigPkg = extraConfigPkgFromFiles [ "pipewire" "client" "jack" "pipewire-pulse" ] (
+    mapToFiles "pipewire" cfg.extraConfig.pipewire
+    // mapToFiles "client" cfg.extraConfig.client
+    // mapToFiles "jack" cfg.extraConfig.jack
+    // mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse
+  );
 
   configs = pkgs.buildEnv {
     name = "pipewire-configs";
@@ -205,27 +202,6 @@ in
             [wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-client
           '';
         };
-        client-rt = mkOption {
-          type = attrsOf json.type;
-          default = { };
-          example = {
-            "10-alsa-linear-volume" = {
-              "alsa.properties" = {
-                "alsa.volume-method" = "linear";
-              };
-            };
-          };
-          description = ''
-            Additional configuration for the PipeWire client library, used by real-time applications and legacy ALSA clients.
-
-            Every item in this attrset becomes a separate drop-in file in `/etc/pipewire/client-rt.conf.d`.
-
-            See the [PipeWire wiki][wiki] for examples of general configuration, and [PipeWire wiki - ALSA][wiki-alsa] for ALSA clients.
-
-            [wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-client
-            [wiki-alsa]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-ALSA
-          '';
-        };
         jack = mkOption {
           type = attrsOf json.type;
           default = { };
@@ -341,6 +317,10 @@ in
       pipewire-media-session is no longer supported upstream and has been removed.
       Please switch to `services.pipewire.wireplumber` instead.
     '')
+    (mkRemovedOptionModule [ "services" "pipewire" "extraConfig" "client-rt" ] ''
+      `services.pipewire.extraConfig.client-rt` is no longer applicable, as `client-rt.conf` has been
+      removed upstream. Please move your customizations to `services.pipewire.extraConfig.client`.
+    '')
   ];
 
   ###### implementation

nixos/modules/system/boot/systemd.nix

@@ -88,6 +88,7 @@ let
       "sys-fs-fuse-connections.mount"
       ] ++ (optional (!config.boot.isContainer) "sys-kernel-config.mount") ++ [
       "sys-kernel-debug.mount"
+      "sys-kernel-tracing.mount"
 
       # Maintaining state across reboots.
       "systemd-random-seed.service"

nixos/tests/installed-tests/xdg-desktop-portal.nix

@@ -1,22 +1,32 @@
-{ pkgs, makeInstalledTest, ... }:
+{
+  lib,
+  pkgs,
+  makeInstalledTest,
+  ...
+}:
 
 makeInstalledTest {
   tested = pkgs.xdg-desktop-portal;
 
-  # Red herring
-  # Failed to load RealtimeKit property: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.RealtimeKit1 was not provided by any .service files
-  # Maybe a red herring, enabling PipeWire doesn't fix the location test.
-  # Failed connect to PipeWire: Couldn't connect to PipeWire
   testConfig = {
     environment.variables = {
-      TEST_IN_CI = 1;
-      XDG_DATA_DIRS = "${pkgs.xdg-desktop-portal.installedTests}/share/installed-tests/xdg-desktop-portal/share";
+      GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" [
+        pkgs.glib.out
+        pkgs.umockdev.out
+      ];
+      # need to set this ourselves, because the tests will set LD_PRELOAD=libumockdev-preload.so,
+      # which can't be found because it's not in default rpath
+      LD_PRELOAD = "${pkgs.umockdev.out}/lib/libumockdev-preload.so";
+      XDP_TEST_IN_CI = 1;
     };
-    # Broken, see comment in the package file.
-    #services.geoclue2 = {
-    #  enable = true;
-    #  enableDemoAgent = true;
-    #};
-    #location.provider = "geoclue2";
+    environment.systemPackages = with pkgs; [
+      umockdev
+      wireless-regdb
+    ];
+    services.geoclue2 = {
+      enable = true;
+      enableDemoAgent = true;
+    };
+    location.provider = "geoclue2";
   };
 }

pkgs/applications/audio/ardour/7.nix

@@ -52,7 +52,7 @@
   soundtouch,
   sratom,
   suil,
-  taglib,
+  taglib_1,
   vamp-plugin-sdk,
   wafHook,
   xjadeo,
@@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
       soundtouch
       sratom
       suil
-      taglib
+      taglib_1
       vamp-plugin-sdk
     ]
     ++ lib.optionals videoSupport [

pkgs/applications/audio/clementine/default.nix

@@ -11,7 +11,7 @@
   qtbase,
   qtx11extras,
   qttools,
-  taglib,
+  taglib_1,
   fftw,
   glew,
   qjson,
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
       qtx11extras
       qttools
       sqlite
-      taglib
+      taglib_1
       alsa-lib
     ]
     # gst_plugins needed for setup-hooks

pkgs/applications/audio/soundkonverter/default.nix

@@ -19,7 +19,7 @@
   kxmlgui,
   qtbase,
   phonon,
-  taglib,
+  taglib_1,
   # optional backends
   withCD ? true,
   cdparanoia,
@@ -131,7 +131,7 @@ mkDerivation rec {
     qtbase
     phonon
   ];
-  buildInputs = [ taglib ] ++ runtimeDeps;
+  buildInputs = [ taglib_1 ] ++ runtimeDeps;
   # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5
   cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ];
   sourceRoot = "${src.name}/src";

pkgs/applications/editors/vim/common.nix

@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.1.1046";
+  version = "9.1.1122";
 
   outputs = [
     "out"
@@ -11,7 +11,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-bH3p78fWUNQRhluUvqQ5uJ+PxNhz7T7wA/4zxUDH130=";
+    hash = "sha256-Eaxia/FLRCnr8MVDvt+ZUFwIQD5Pqq7SsmWZeQdjuXs=";
   };
 
   enableParallelBuilding = true;

pkgs/applications/networking/browsers/chromium/common.nix

@@ -445,6 +445,9 @@ let
         ./patches/cross-compile.patch
         # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):
         ./patches/no-build-timestamps.patch
+        # Fix build with Pipewire 1.4
+        # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500
+        ./patches/webrtc-pipewire-1.4.patch
       ]
       ++ lib.optionals (packageName == "chromium") [
         # This patch is limited to chromium and ungoogled-chromium because electron-source sets

pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch

@@ -0,0 +1,20 @@
+--- a/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
++++ b/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
+@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
+       .param = OnNodeParam,
+   };
+ 
+-  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
++  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
+ }
+ 
+ // static
+@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) {
+       uint32_t id = info->params[i].id;
+       if (id == SPA_PARAM_EnumFormat &&
+           info->params[i].flags & SPA_PARAM_INFO_READ) {
+-        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
++        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
+         break;
+       }
+     }

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch

@@ -0,0 +1,20 @@
+--- a/src/modules/video_capture/linux/pipewire_session.cc
++++ b/src/modules/video_capture/linux/pipewire_session.cc
+@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
+       .param = OnNodeParam,
+   };
+ 
+-  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
++  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
+ }
+ 
+ // static
+@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) {
+       uint32_t id = info->params[i].id;
+       if (id == SPA_PARAM_EnumFormat &&
+           info->params[i].flags & SPA_PARAM_INFO_READ) {
+-        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
++        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
+         break;
+       }
+     }