pipewire/wireplumber: update

20 files changed, 142 insertions, 134 deletions

diff --git a/darktable_my.nix b/darktable_my.nix
index 1313477..3b4a410 100644
--- a/darktable_my.nix
+++ b/darktable_my.nix
@@ -17,7 +17,7 @@ self: super: {
         src = fetchGit {
           url = "https://github.com/darktable-org/darktable";
           ref = "master";
-#          rev = "d2f15c8d1da5bb9b72cb554f9f606db953fb75ed";
+          #          rev = "d2f15c8d1da5bb9b72cb554f9f606db953fb75ed";
           submodules = true;
         };
         #            nativeBuildInputs = old.nativeBuldInputs ++ [
@@ -25,7 +25,7 @@ self: super: {
         #clang pkg-config
         #intltool perl desktop-file-utils wrapGAppsHook gsettings-desktop-schemas
         #           ];
-#        cmakeFlags = old.cmakeFlags ++ [ "-DUSE_AVIF=OFF" ]; # fuck
+        #        cmakeFlags = old.cmakeFlags ++ [ "-DUSE_AVIF=OFF" ]; # fuck
         nativeBuildInputs = old.nativeBuildInputs ++ [
           git
           po4a
diff --git a/exiv2_my.nix b/exiv2_my.nix
index 57396cc..5517c96 100644
--- a/exiv2_my.nix
+++ b/exiv2_my.nix
@@ -7,8 +7,8 @@ self: super: {
       src = fetchGit {
         url = "https://github.com/Exiv2/exiv2";
         ref = "main";
-                      rev = "316cb55574b33d8d4b3e3c240bf3f9e881135e52";
-#        rev = "4af576c067b72a1968066202eec1ddb577383a63";
+        rev = "316cb55574b33d8d4b3e3c240bf3f9e881135e52";
+        #        rev = "4af576c067b72a1968066202eec1ddb577383a63";
       };
       buildInputs = oldAttrs.buildInputs ++ [
         brotli
diff --git a/flake.nix b/flake.nix
index e9256a7..e8f8e64 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,19 +1,22 @@
 {
-  outputs = { self }:
+  outputs =
+    { self }:
     let
-      nixFiles = builtins.filter
-        (f: f != "flake.nix" && builtins.match ".*\\.nix" f != null)
-        (builtins.attrNames (builtins.readDir ./.));
+      nixFiles = builtins.filter (f: f != "flake.nix" && builtins.match ".*\\.nix" f != null) (
+        builtins.attrNames (builtins.readDir ./.)
+      );
 
       makeOverlay = file: {
         name = builtins.replaceStrings [ ".nix" ] [ "" ] file;
-        value = inputs: (import (./. + "/${file}") {
-          inherit inputs;
-        });
+        value =
+          inputs:
+          (import (./. + "/${file}") {
+            inherit inputs;
+          });
       };
 
-    in {
+    in
+    {
       overlays = builtins.listToAttrs (map makeOverlay nixFiles);
     };
 }
-
diff --git a/freerdp_my.nix b/freerdp_my.nix
index 1c3ac65..dc31060 100644
--- a/freerdp_my.nix
+++ b/freerdp_my.nix
@@ -27,20 +27,19 @@ self: super: {
 
       doCheck = false;
 
-      postPatch =
-        ''
-          export HOME=$TMP
+      postPatch = ''
+        export HOME=$TMP
 
-          # skip NIB file generation on darwin
-          sed -z 's/NIB file generation.*//' -i client/Mac{,/cli}/CMakeLists.txt
+        # skip NIB file generation on darwin
+        sed -z 's/NIB file generation.*//' -i client/Mac{,/cli}/CMakeLists.txt
 
-          substituteInPlace "libfreerdp/freerdp.pc.in" \
-            --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
-        ''
-        + lib.optionalString (pcsclite != null) ''
-          substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
-            --replace "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so"
-        '';
+        substituteInPlace "libfreerdp/freerdp.pc.in" \
+          --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
+      ''
+      + lib.optionalString (pcsclite != null) ''
+        substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
+          --replace "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so"
+      '';
 
       buildInputs = [
         cairo
@@ -83,28 +82,27 @@ self: super: {
       ];
 
       # https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746
-      cmakeFlags =
-        [
-          "-Wno-dev"
-          "-DCMAKE_INSTALL_LIBDIR=lib"
-          "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
-        ]
-        ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
-          BUILD_TESTING = false; # false is recommended by upstream
-          WITH_CAIRO = true;
-          WITH_CUPS = false;
-          WITH_FAAC = false;
-          WITH_FAAD2 = true;
-          WITH_JPEG = true;
-          WITH_OPENH264 = false;
-          WITH_OSS = false;
-          WITH_PCSC = false;
-          WITH_PULSE = false;
-          WITH_SERVER = true;
-          WITH_VAAPI = false; # false is recommended by upstream
-          WITH_X11 = true;
-          WITH_CLIENT_SDL = false;
-        };
+      cmakeFlags = [
+        "-Wno-dev"
+        "-DCMAKE_INSTALL_LIBDIR=lib"
+        "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
+      ]
+      ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
+        BUILD_TESTING = false; # false is recommended by upstream
+        WITH_CAIRO = true;
+        WITH_CUPS = false;
+        WITH_FAAC = false;
+        WITH_FAAD2 = true;
+        WITH_JPEG = true;
+        WITH_OPENH264 = false;
+        WITH_OSS = false;
+        WITH_PCSC = false;
+        WITH_PULSE = false;
+        WITH_SERVER = true;
+        WITH_VAAPI = false; # false is recommended by upstream
+        WITH_X11 = true;
+        WITH_CLIENT_SDL = false;
+      };
 
       meta = with lib; {
         description = "A Remote Desktop Protocol Client";
diff --git a/hyprland.nix b/hyprland.nix
index bf7286b..e7cabbe 100644
--- a/hyprland.nix
+++ b/hyprland.nix
@@ -8,22 +8,22 @@ self: super: {
       src = fetchGit {
         url = "https://github.com/hyprwm/Hyprland";
         ref = "main";
-#        rev = "5ee35f914f921e5696030698e74fb5566a804768";
+        #        rev = "5ee35f914f921e5696030698e74fb5566a804768";
         submodules = true;
       };
       buildInputs = old.buildInputs ++ [ glaze ];
-        mesonFlags = concatLists [ 
-    (mapAttrsToList mesonEnable { 
-      "xwayland" = true; 
-      "systemd" = true;
-      "uwsm" = false;
-      "hyprpm" = false; 
-    }) 
-    (mapAttrsToList mesonBool { 
-      # PCH provides no benefits when building with Nix 
-      "b_pch" = false;
-      "tracy_enable" = false; 
-    }) 
-  ];
+      mesonFlags = concatLists [
+        (mapAttrsToList mesonEnable {
+          "xwayland" = true;
+          "systemd" = true;
+          "uwsm" = false;
+          "hyprpm" = false;
+        })
+        (mapAttrsToList mesonBool {
+          # PCH provides no benefits when building with Nix
+          "b_pch" = false;
+          "tracy_enable" = false;
+        })
+      ];
     });
 }
diff --git a/hyprutils.nix b/hyprutils.nix
index 1cd2156..3e51267 100644
--- a/hyprutils.nix
+++ b/hyprutils.nix
@@ -7,7 +7,7 @@ self: super: {
       src = fetchGit {
         url = "https://github.com/hyprwm/hyprutils";
         ref = "main";
-#        rev = "2cd5e4fcd5a77f5c7ebc3f6afac4a86336c31281";
+        #        rev = "2cd5e4fcd5a77f5c7ebc3f6afac4a86336c31281";
       };
     });
 }
diff --git a/intel-compute-runtime.nix b/intel-compute-runtime.nix
index b5ebe54..1f9fb16 100644
--- a/intel-compute-runtime.nix
+++ b/intel-compute-runtime.nix
@@ -3,14 +3,14 @@
   intel-compute-runtime =
     with super;
     intel-compute-runtime.overrideAttrs (oldAttrs: rec {
-                  version = "25.22.33944.9";
-#      version = "25.18.33578.11";
+      version = "25.22.33944.9";
+      #      version = "25.18.33578.11";
       src = fetchFromGitHub {
         owner = "intel";
         repo = "compute-runtime";
         rev = version;
         hash = "sha256-99FV6U4Gx5cOsS9tcIR97u++7+Pt7W/hEdJyVnLWuEw=";
-#                        hash = "sha256-5AKQieCc6Aq+Yg/ELQlDXdsvuSZqNuM6ZZlsqc0zwrU=";
+        #                        hash = "sha256-5AKQieCc6Aq+Yg/ELQlDXdsvuSZqNuM6ZZlsqc0zwrU=";
       };
     });
 })
diff --git a/libaom_my.nix b/libaom_my.nix
index 5ea28ce..a9f1ad2 100644
--- a/libaom_my.nix
+++ b/libaom_my.nix
@@ -1,23 +1,23 @@
 { inputs }:
 self: super: {
   libaom_my = with super; libaom;
-#   libaom_my =
-#     with super;
-#     (libaom.override {
-#       #stdenv = llvmPackages_15.stdenv;
-#       #enableButteraugli = true;
-#       enableVmaf = true;
-#     }).overrideAttrs
-#       (old: rec {
-# #         version = "git";
-# #         src = fetchGit {
-# #           url = "https://aomedia.googlesource.com/aom";
-# #           ref = "main";
-# #                                 rev = "46eb4e460154505f205f7d53c8054268b58aba7a";
-# # #          rev = "e0e69ad3aa30b38135337c1a7dfd7f1535d335c8";
-# #         };
-#         #configureFlags =(lib.lists.remove "--enable-avresample" (lib.lists.remove "--disable-avresample" oldAttrs.configureFlags))
-# #        patches = [ /home/sss/nix/patches/libaom/libaom.patch ];
-# #        patches = [];
-#       });
+  #   libaom_my =
+  #     with super;
+  #     (libaom.override {
+  #       #stdenv = llvmPackages_15.stdenv;
+  #       #enableButteraugli = true;
+  #       enableVmaf = true;
+  #     }).overrideAttrs
+  #       (old: rec {
+  # #         version = "git";
+  # #         src = fetchGit {
+  # #           url = "https://aomedia.googlesource.com/aom";
+  # #           ref = "main";
+  # #                                 rev = "46eb4e460154505f205f7d53c8054268b58aba7a";
+  # # #          rev = "e0e69ad3aa30b38135337c1a7dfd7f1535d335c8";
+  # #         };
+  #         #configureFlags =(lib.lists.remove "--enable-avresample" (lib.lists.remove "--disable-avresample" oldAttrs.configureFlags))
+  # #        patches = [ /home/sss/nix/patches/libaom/libaom.patch ];
+  # #        patches = [];
+  #       });
 }
diff --git a/libavif_my.nix b/libavif_my.nix
index cdb7de5..56b7fb7 100644
--- a/libavif_my.nix
+++ b/libavif_my.nix
@@ -15,6 +15,6 @@ self: super: {
           rev = "a4fec908b582fd7b82c86014a68e54dc5e0f4058";
         };
         cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DAVIF_LIBYUV_ENABLED=ON" ];
-        patches = [];
+        patches = [ ];
       });
 }
diff --git a/libheif_my.nix b/libheif_my.nix
index 4fa1055..4981cd8 100644
--- a/libheif_my.nix
+++ b/libheif_my.nix
@@ -7,8 +7,8 @@ self: super: {
       src = fetchGit {
         url = "https://github.com/strukturag/libheif";
         ref = "master";
-                rev = "e0bfb132ab984ad3d7703b5183a9fb336d96f8a0";
-       # rev = "3d66463504385ba8b9ab70b0a6d9d7e6d392a4d9";
+        rev = "e0bfb132ab984ad3d7703b5183a9fb336d96f8a0";
+        # rev = "3d66463504385ba8b9ab70b0a6d9d7e6d392a4d9";
       };
       nativeBuildInputs = [
         pkg-config
diff --git a/llama-cpp-cpu.nix b/llama-cpp-cpu.nix
index ad10408..1815dcc 100644
--- a/llama-cpp-cpu.nix
+++ b/llama-cpp-cpu.nix
@@ -12,8 +12,8 @@ self: super: {
       (old: rec {
         version = "git";
         src = fetchGit {
-#          url = "https://github.com/ggerganov/llama.cpp";
-#          ref = "master";
+          #          url = "https://github.com/ggerganov/llama.cpp";
+          #          ref = "master";
           url = "https://github.com/ikawrakow/ik_llama.cpp";
           ref = "main";
           submodules = true;
diff --git a/mlt_my.nix b/mlt_my.nix
index 75c1ab3..507e7f8 100644
--- a/mlt_my.nix
+++ b/mlt_my.nix
@@ -16,7 +16,16 @@ self: super: {
           url = "https://github.com/mltframework/mlt";
           ref = "master";
         };
-        buildInputs = with qt6Packages; old.buildInputs ++ [ gdk-pixbuf libebur128 qtbase qtsvg qt5compat ];
+        buildInputs =
+          with qt6Packages;
+          old.buildInputs
+          ++ [
+            gdk-pixbuf
+            libebur128
+            qtbase
+            qtsvg
+            qt5compat
+          ];
         nativeBuildInputs = with qt6Packages; old.nativeBuildInputs ++ [ wrapQtAppsNoGuiHook ];
       });
 }
diff --git a/pipewire.nix b/pipewire.nix
index 400f63b..694b93a 100644
--- a/pipewire.nix
+++ b/pipewire.nix
@@ -9,13 +9,12 @@ self: super: {
       x11Support = false;
     }).overrideAttrs
       (old: rec {
-        version = "git";
+        version = "2025-08-13-git";
         name = "pipewire";
         src = fetchGit {
           url = "https://gitlab.freedesktop.org/pipewire/pipewire";
           ref = "master";
-#          rev = "2771c435fdc9b751c00c57dc48d83069e3fe7396";
-                              rev = "4f3a2d723b617e278efc82835baa93f65d756fa4";
+          rev = "e8ae244b2b656b32eeac257ed4c2e87e43435c44";
         };
 
         postUnpack = ''
@@ -44,7 +43,7 @@ self: super: {
           (lib.mesonEnable "avahi" false)
           (lib.mesonEnable "gstreamer" true)
           (lib.mesonEnable "gstreamer-device-provider" true)
-          (lib.mesonEnable "systemd" true)
+          (lib.mesonEnable "onnxruntime" false)
           (lib.mesonEnable "systemd-system-service" true)
           (lib.mesonEnable "udev" false)
           (lib.mesonEnable "ffmpeg" true)
diff --git a/qtcreator_my.nix b/qtcreator_my.nix
index cceff79..61cd89d 100644
--- a/qtcreator_my.nix
+++ b/qtcreator_my.nix
@@ -6,7 +6,7 @@ self: super: {
     in
     with super;
     (qtcreator.overrideAttrs (old: rec {
-       version = "2025_07_23";
+      version = "2025_07_23";
       src = fetchGit {
         url = "https://github.com/qt-creator/qt-creator";
         ref = "master";
diff --git a/rawtherapee_my.nix b/rawtherapee_my.nix
index ea0a7b5..5a8fbda 100644
--- a/rawtherapee_my.nix
+++ b/rawtherapee_my.nix
@@ -2,20 +2,21 @@
 self: super: {
   rawtherapee_my =
     with super;
-    (rawtherapee.override { 
-    #  exiv2 = self.exiv2_my;
-    }).overrideAttrs (oldAttrs: rec {
-      version = "git";
-      src = fetchGit {
-        url = "https://github.com/Beep6581/RawTherapee";
-        ref = "dev";
-        submodules = true;
-      };
-      patches = [ ];
-      buildInputs = oldAttrs.buildInputs ++ [
-        #self.my_exiv2
-        self.libraw
-      ];
-      cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DWITH_SYSTEM_LIBRAW=TRUE" ];
-    });
+    (rawtherapee.override {
+      #  exiv2 = self.exiv2_my;
+    }).overrideAttrs
+      (oldAttrs: rec {
+        version = "git";
+        src = fetchGit {
+          url = "https://github.com/Beep6581/RawTherapee";
+          ref = "dev";
+          submodules = true;
+        };
+        patches = [ ];
+        buildInputs = oldAttrs.buildInputs ++ [
+          #self.my_exiv2
+          self.libraw
+        ];
+        cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DWITH_SYSTEM_LIBRAW=TRUE" ];
+      });
 }
diff --git a/shaderc_my.nix b/shaderc_my.nix
index f4c6e01..4393562 100644
--- a/shaderc_my.nix
+++ b/shaderc_my.nix
@@ -43,15 +43,14 @@ self: super: {
         patchShebangs --build utils/
       '';
 
-      nativeBuildInputs =
-        [
-          cmake
-          python3
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]
-        ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-          autoSignDarwinBinariesHook
-        ];
+      nativeBuildInputs = [
+        cmake
+        python3
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]
+      ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+        autoSignDarwinBinariesHook
+      ];
 
       postInstall = ''
         moveToOutput "lib/*.a" $static
diff --git a/shit-run.nix b/shit-run.nix
index a3fd645..220c457 100644
--- a/shit-run.nix
+++ b/shit-run.nix
@@ -111,12 +111,12 @@ mod: orig: {
         xorg.libSM
         xorg.libICE
         pkgs2505.gnome2.GConf
-#        (gnome2.GConf.overrideAttrs (
-#          old: rec {
-#            nativeBuildInputs = old.nativeBuildInputs ++ [ python3Packages.2to3 ];
-#          }
-#          )
-#        )
+        #        (gnome2.GConf.overrideAttrs (
+        #          old: rec {
+        #            nativeBuildInputs = old.nativeBuildInputs ++ [ python3Packages.2to3 ];
+        #          }
+        #          )
+        #        )
         curlWithGnuTls
         nspr
         nss
diff --git a/shotwell_my.nix b/shotwell_my.nix
index 314996e..959a749 100644
--- a/shotwell_my.nix
+++ b/shotwell_my.nix
@@ -1,7 +1,7 @@
 { inputs }:
-  let
-#    oldpkgs = import inputs.nixpkgs2411 { };
-  in
+let
+  #    oldpkgs = import inputs.nixpkgs2411 { };
+in
 self: super: {
   shotwell_my =
     with super;
@@ -12,7 +12,7 @@ self: super: {
         ref = "master";
         #                rev = "59a38897bf28cba9ef787840dac72e4647510bbb";
       };
-#      nativeBuildInputs = old.nativeBuildInputs ++ [ cmake pkg-config ];
+      #      nativeBuildInputs = old.nativeBuildInputs ++ [ cmake pkg-config ];
       buildInputs = [
         gtk4
         libexif
diff --git a/wayland-protocols.nix b/wayland-protocols.nix
index 611cb65..0fd1ecb 100644
--- a/wayland-protocols.nix
+++ b/wayland-protocols.nix
@@ -6,7 +6,7 @@ self: super: {
       version = "1.45";
       src = fetchurl {
         url = "https://gitlab.freedesktop.org/wayland/${old.pname}/-/releases/${version}/downloads/${old.pname}-${version}.tar.xz";
-#        hash = "sha256-J4a2sbeZZeMT8sKJwSB1ue1wDUGESBDFGv2hDuMpV2s=";
+        #        hash = "sha256-J4a2sbeZZeMT8sKJwSB1ue1wDUGESBDFGv2hDuMpV2s=";
         hash = "sha256-TSsqnj4JnQF9yBB78cM00nu4fZ5K/xmgyNhW0XzUHvA=";
       };
     });
diff --git a/wireplumber.nix b/wireplumber.nix
index ab681fc..06a16a8 100644
--- a/wireplumber.nix
+++ b/wireplumber.nix
@@ -3,12 +3,11 @@ self: super: {
   wireplumber =
     with super;
     wireplumber.overrideAttrs (oldAttrs: rec {
-      version = "git";
+      version = "2025-08-15-git";
       src = fetchGit {
         url = "https://gitlab.freedesktop.org/pipewire/wireplumber";
         ref = "master";
-                rev = "7a4d3177550b6b53fe0a49396da5b07f5353daff";
-#        rev = "2a5606e43702a3d3a6facdd10d5de685290d6811";
+        rev = "30e8440b256d04ddd4bfaeb2758d4d5189789952";
       };
       nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wrapGAppsHook ];
       buildInputs = oldAttrs.buildInputs ++ [ gsettings-desktop-schemas ];