cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

pipewire: 0.3.42 -> 0.3.43

Browse source
This commit is contained in:
Jan Solanti 2022-01-06 01:34:12 +02:00
parent bd2672f2e5
commit 774f7656d4
1 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pkgs/development/libraries/pipewire/default.nix
View file

@ -60,16 +60,12 @@
}: }:
let let
fontsConf = makeFontsConf { mesonEnableFeature = b: if b then "enabled" else "disabled";
fontDirectories = [ ];
};
mesonEnable = b: if b then "enabled" else "disabled";
mesonList = l: "[" + lib.concatStringsSep "," l + "]"; mesonList = l: "[" + lib.concatStringsSep "," l + "]";
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "pipewire"; pname = "pipewire";
version = "0.3.42"; version = "0.3.43";
outputs = [ outputs = [
"out" "out"
@ -87,7 +83,7 @@ let
owner = "pipewire"; owner = "pipewire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
sha256 = "sha256-Iyd5snOt+iCT7W0+FlfvhMUZo/gF+zr9JX4HIGVdHto="; sha256 = "sha256-vjMA9dQvZe7dPbF9BNtCYf1V240RUBdtxeyqFjWA4j4=";
}; };
patches = [ patches = [
@ -103,15 +99,6 @@ let
./0090-pipewire-config-template-paths.patch ./0090-pipewire-config-template-paths.patch
# Place SPA data files in lib output to avoid dependency cycles # Place SPA data files in lib output to avoid dependency cycles
./0095-spa-data-dir.patch ./0095-spa-data-dir.patch
# Fix attempt to put system service units into pkgs.systemd.
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b666edde787b167c6e19b9356257d48007357acc.diff";
sha256 = "1pmnyyvrjykr46ld4a5frq3cc739f8h4jwvfj414lyx8c6ybm63s";
})
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5054b48c9de655b4b48f7c801cb305d9eb122520.diff";
sha256 = "0myhb7h4g7x2nr08dpx8d7nqhsmzp90yanmkvm627r1xxnnr3ivn";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -159,33 +146,32 @@ let
"-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Dinstalled_test_prefix=${placeholder "installedTests"}"
"-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dpipewire_pulse_prefix=${placeholder "pulse"}"
"-Dlibjack-path=${placeholder "jack"}/lib" "-Dlibjack-path=${placeholder "jack"}/lib"
"-Dlibcamera=${mesonEnable libcameraSupport}" "-Dlibcamera=${mesonEnableFeature libcameraSupport}"
"-Droc=${mesonEnable rocSupport}" "-Droc=${mesonEnableFeature rocSupport}"
"-Dlibpulse=${mesonEnable pulseTunnelSupport}" "-Dlibpulse=${mesonEnableFeature pulseTunnelSupport}"
"-Davahi=${mesonEnable zeroconfSupport}" "-Davahi=${mesonEnableFeature zeroconfSupport}"
"-Dgstreamer=${mesonEnable gstreamerSupport}" "-Dgstreamer=${mesonEnableFeature gstreamerSupport}"
"-Dsystemd-system-service=enabled" "-Dsystemd-system-service=enabled"
"-Dffmpeg=${mesonEnable ffmpegSupport}" "-Dffmpeg=${mesonEnableFeature ffmpegSupport}"
"-Dbluez5=${mesonEnable bluezSupport}" "-Dbluez5=${mesonEnableFeature bluezSupport}"
"-Dbluez5-backend-hsp-native=${mesonEnable nativeHspSupport}" "-Dbluez5-backend-hsp-native=${mesonEnableFeature nativeHspSupport}"
"-Dbluez5-backend-hfp-native=${mesonEnable nativeHfpSupport}" "-Dbluez5-backend-hfp-native=${mesonEnableFeature nativeHfpSupport}"
"-Dbluez5-backend-ofono=${mesonEnable ofonoSupport}" "-Dbluez5-backend-ofono=${mesonEnableFeature ofonoSupport}"
"-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}" "-Dbluez5-backend-hsphfpd=${mesonEnableFeature hsphfpdSupport}"
"-Dsysconfdir=/etc" "-Dsysconfdir=/etc"
"-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire"
"-Dsession-managers=" "-Dsession-managers="
"-Dvulkan=enabled" "-Dvulkan=enabled"
]; ];
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file # Fontconfig error: Cannot load default config file
FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
doCheck = true; doCheck = true;
postUnpack = '' postUnpack = ''
patchShebangs source/doc/strip-static.sh
patchShebangs source/doc/input-filter.sh patchShebangs source/doc/input-filter.sh
patchShebangs source/doc/input-filter-h.sh patchShebangs source/doc/input-filter-h.sh
patchShebangs source/spa/tests/gen-cpp-test.py
''; '';
postInstall = '' postInstall = ''