colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118701 from jansol/pipewire

Browse Source 
pipewire: 0.3.24 -> 0.3.25
This commit is contained in:
Bernardo Meurer 2021-04-07 21:35:29 +00:00 committed by GitHub
commit 890b13b38c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
View File

@ -8,7 +8,13 @@
} }
], ],
"actions": { "actions": {
"update-props": {} "update-props": {
"bluez5.reconnect-profiles": [
"hfp_hf",
"hsp_hs",
"a2dp_sink"
]
}
} }
}, },
{ {

10
pkgs/development/libraries/pipewire/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitLab , fetchFromGitLab
, fetchpatch
, removeReferencesTo , removeReferencesTo
, meson , meson
, ninja , ninja
@ -43,7 +42,7 @@ let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "pipewire"; pname = "pipewire";
version = "0.3.24"; version = "0.3.25";
outputs = [ outputs = [
"out" "out"
@ -61,7 +60,7 @@ let
owner = "pipewire"; owner = "pipewire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
hash = "sha256:PcY20FTtUtJYAwCscEs+HfkdwDksYPFZIVTVORP1ooI="; hash = "sha256:EbXWcf6QLtbvm6/eXBI+PF2sTw2opYfmc+H/SMDEH1U=";
}; };
patches = [ patches = [
@ -75,11 +74,6 @@ let
./0070-installed-tests-path.patch ./0070-installed-tests-path.patch
# Add flag to specify configuration directory (different from the installation directory). # Add flag to specify configuration directory (different from the installation directory).
./0080-pipewire-config-dir.patch ./0080-pipewire-config-dir.patch
# Fix JSON parser.
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/34800dc0191a4ee7a329eeb361a6f2ccf4a75176.diff";
sha256 = "0dzxzr408qqzf0252nwg14709p1lb2k826i3kdzg6djq8w98d5aj";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [