git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #132883 from Kranzes/bump-pipewire

pipewire: 0.3.32 -> 0.3.33

commit2904cd75215dafa708a7defb2a9a7a7d6570e15e authorDomen Kožar <domen@dev.si> dateSat 7 Aug 2021, 12:47 (5 years ago) parentf1d1ed4a876500
6 files changed+85−6
compare with master
unifiedsplit
nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json+35 nixos/modules/services/desktops/pipewire/jack.conf.json+11−1 nixos/modules/services/desktops/pipewire/media-session.conf.json+1 pkgs/development/libraries/libfreeaptx/default.nix+31 pkgs/development/libraries/pipewire/default.nix+5−5 pkgs/top-level/all-packages.nix+2
nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json+35
@@ -27,6 +27,12 @@
2727 "msbc-alt1-rtl"
2828 ]
2929 },
30+ {
31+ "name": "BAA 100",
32+ "no-features": [
33+ "hw-volume"
34+ ]
35+ },
3036 {
3137 "name": "JBL Endurance RUN BT",
3238 "no-features": [
@@ -190,6 +196,35 @@
190196 "msbc-alt1"
191197 ]
192198 },
199+ {
200+ "sysname": "Linux",
201+ "release": "~^5\\.12\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17)($|[^0-9])"
202+ },
203+ {
204+ "sysname": "Linux",
205+ "release": "~^5\\.12\\.",
206+ "no-features": [
207+ "msbc-alt1"
208+ ]
209+ },
210+ {
211+ "sysname": "Linux",
212+ "release": "~^5\\.13\\.(1|2)($|[^0-9])"
213+ },
214+ {
215+ "sysname": "Linux",
216+ "release": "~^5\\.13\\.",
217+ "no-features": [
218+ "msbc-alt1"
219+ ]
220+ },
221+ {
222+ "sysname": "Linux",
223+ "release": "~^5\\.14\\.",
224+ "no-features": [
225+ "msbc-alt1"
226+ ]
227+ },
193228 {
194229 "no-features": []
195230 }
nixos/modules/services/desktops/pipewire/jack.conf.json+11−1
@@ -24,5 +24,15 @@
2424 "name": "libpipewire-module-metadata"
2525 }
2626 ],
27− "jack.properties": {}
27+ "jack.properties": {},
28+ "jack.rules": [
29+ {
30+ "matches": [
31+ {}
32+ ],
33+ "actions": {
34+ "update-props": {}
35+ }
36+ }
37+ ]
2838}
nixos/modules/services/desktops/pipewire/media-session.conf.json+1
@@ -59,6 +59,7 @@
5959 "with-pulseaudio": [
6060 "with-audio",
6161 "bluez5",
62+ "bluez5-autoswitch",
6263 "logind",
6364 "restore-stream",
6465 "streams-follow-default"
pkgs/development/libraries/libfreeaptx/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib, stdenv, fetchFromGitHub }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "libfreeaptx";
5+ version = "0.1.1";
6+
7+ src = fetchFromGitHub {
8+ owner = "iamthehorker";
9+ repo = pname;
10+ rev = version;
11+ sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo=";
12+ };
13+
14+ makeFlags = [
15+ "PREFIX=${placeholder "out"}"
16+ # disable static builds
17+ "ANAME="
18+ "AOBJECTS="
19+ "STATIC_UTILITIES="
20+ ];
21+
22+ enableParallelBuilding = true;
23+
24+ meta = with lib; {
25+ description = "Free Implementation of Audio Processing Technology codec (aptX)";
26+ license = licenses.lgpl21Plus;
27+ homepage = "https://github.com/iamthehorker/libfreeaptx";
28+ platforms = platforms.linux;
29+ maintainers = with maintainers; [ kranzes ];
30+ };
31+}
pkgs/development/libraries/pipewire/default.nix+5−5
@@ -29,7 +29,7 @@
2929, withMediaSession ? true
3030, gstreamerSupport ? true, gst_all_1 ? null
3131, ffmpegSupport ? true, ffmpeg ? null
32−, bluezSupport ? true, bluez ? null, sbc ? null, libopenaptx ? null, ldacbt ? null, fdk_aac ? null
32+, bluezSupport ? true, bluez ? null, sbc ? null, libfreeaptx ? null, ldacbt ? null, fdk_aac ? null
3333, nativeHspSupport ? true
3434, nativeHfpSupport ? true
3535, ofonoSupport ? true
@@ -48,7 +48,7 @@ let
4848
4949 self = stdenv.mkDerivation rec {
5050 pname = "pipewire";
51− version = "0.3.32";
51+ version = "0.3.33";
5252
5353 outputs = [
5454 "out"
@@ -66,7 +66,7 @@ let
6666 owner = "pipewire";
6767 repo = "pipewire";
6868 rev = version;
69− sha256 = "0f5hkypiy1qjqj3frzz128668hzbi0fqmj0j21z7rp51y62dapnp";
69+ sha256 = "sha256-HP2HcGjrLw0+8pO1upvJQk32v+bifYpi5Rtod0TbBis=";
7070 };
7171
7272 patches = [
@@ -110,7 +110,7 @@ let
110110 systemd
111111 ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
112112 ++ lib.optional ffmpegSupport ffmpeg
113− ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ]
113+ ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ]
114114 ++ lib.optional pulseTunnelSupport libpulseaudio
115115 ++ lib.optional zeroconfSupport avahi;
116116
@@ -209,7 +209,7 @@ let
209209 homepage = "https://pipewire.org/";
210210 license = licenses.mit;
211211 platforms = platforms.linux;
212− maintainers = with maintainers; [ jtojnar ];
212+ maintainers = with maintainers; [ jtojnar kranzes ];
213213 };
214214 };
215215
pkgs/top-level/all-packages.nix+2
@@ -16747,6 +16747,8 @@ in
1674716747
1674816748 libffi = callPackage ../development/libraries/libffi { };
1674916749
16750+ libfreeaptx = callPackage ../development/libraries/libfreeaptx { };
16751+
1675016752 libfreefare = callPackage ../development/libraries/libfreefare {
1675116753 inherit (darwin) libobjc;
1675216754 };