summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Solanti <jhs@psonet.com>2021-04-06 22:58:49 +0300
committerJan Solanti <jhs@psonet.com>2021-04-07 16:23:43 +0300
commitf94c84f84481e6b3bc12eee3a8e2de444bc2594b (patch)
tree0ec813bda5317659c845882b3096c78d77924381
parenta05293a93c8498ee3b2e72afc91cbfbd04547918 (diff)
downloadnixpkgs-f94c84f84481e6b3bc12eee3a8e2de444bc2594b.tar
nixpkgs-f94c84f84481e6b3bc12eee3a8e2de444bc2594b.tar.gz
nixpkgs-f94c84f84481e6b3bc12eee3a8e2de444bc2594b.tar.bz2
nixpkgs-f94c84f84481e6b3bc12eee3a8e2de444bc2594b.tar.lz
nixpkgs-f94c84f84481e6b3bc12eee3a8e2de444bc2594b.tar.xz
nixpkgs-f94c84f84481e6b3bc12eee3a8e2de444bc2594b.tar.zst
nixpkgs-f94c84f84481e6b3bc12eee3a8e2de444bc2594b.zip
pipewire: 0.3.24 -> 0.3.25
-rw-r--r--nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json8
-rw-r--r--pkgs/development/libraries/pipewire/default.nix10
2 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json b/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
index 4d50cb9f1ad..bd00571bc35 100644
--- a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
+++ b/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
@@ -8,7 +8,13 @@
         }
       ],
       "actions": {
-        "update-props": {}
+        "update-props": {
+          "bluez5.reconnect-profiles": [
+            "hfp_hf",
+            "hsp_hs",
+            "a2dp_sink"
+          ]
+        }
       }
     },
     {
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index d685bde35ed..47a85c36c23 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitLab
-, fetchpatch
 , removeReferencesTo
 , meson
 , ninja
@@ -43,7 +42,7 @@ let
 
   self = stdenv.mkDerivation rec {
     pname = "pipewire";
-    version = "0.3.24";
+    version = "0.3.25";
 
     outputs = [
       "out"
@@ -61,7 +60,7 @@ let
       owner = "pipewire";
       repo = "pipewire";
       rev = version;
-      hash = "sha256:PcY20FTtUtJYAwCscEs+HfkdwDksYPFZIVTVORP1ooI=";
+      hash = "sha256:EbXWcf6QLtbvm6/eXBI+PF2sTw2opYfmc+H/SMDEH1U=";
     };
 
     patches = [
@@ -75,11 +74,6 @@ let
       ./0070-installed-tests-path.patch
       # Add flag to specify configuration directory (different from the installation directory).
       ./0080-pipewire-config-dir.patch
-      # Fix JSON parser.
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/34800dc0191a4ee7a329eeb361a6f2ccf4a75176.diff";
-        sha256 = "0dzxzr408qqzf0252nwg14709p1lb2k826i3kdzg6djq8w98d5aj";
-      })
     ];
 
     nativeBuildInputs = [