From 89021b9a188880939b8683c0aabbb4b1cc5bece5 Mon Sep 17 00:00:00 2001 From: Nathaniel Glen Date: Wed, 5 Aug 2020 00:13:04 -0400 Subject: [PATCH] pipewire: 0.3.7 -> 0.3.9 Co-authored-by: Jan Tojnar --- .../pipewire/alsa-profiles-use-libdir.patch | 13 +++++++++++++ pkgs/development/libraries/pipewire/default.nix | 15 ++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch diff --git a/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch b/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch new file mode 100644 index 00000000000..c657d12f7d0 --- /dev/null +++ b/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index ffee41b4..f3e4ec74 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,7 +53,7 @@ endif + + spa_plugindir = join_paths(pipewire_libdir, spa_name) + +-alsadatadir = join_paths(pipewire_datadir, 'alsa-card-profile', 'mixer') ++alsadatadir = join_paths(pipewire_libdir, '..', 'share', 'alsa-card-profile', 'mixer') + + pipewire_headers_dir = join_paths(pipewire_name, 'pipewire') + diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index cb5073f50c1..b6cc22a18be 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -24,6 +24,8 @@ , vulkan-loader , libpulseaudio , makeFontsConf +, ofonoSupport ? true +, nativeHspSupport ? true }: let @@ -33,7 +35,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.7"; + version = "0.3.9"; outputs = [ "out" "lib" "dev" "doc" ]; @@ -42,9 +44,14 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "04l66p0wj553gp2zf3vwwh6jbr1vkf6wrq4za9zlm9dn144am4j2"; + sha256 = "0q781r32mnm3qy6xcdd2rnb8g50gdi7mi50zmdiq24s24sr8f8r9"; }; + patches = [ + # Break up a dependency cycle between outputs. + ./alsa-profiles-use-libdir.patch + ]; + nativeBuildInputs = [ doxygen graphviz @@ -78,7 +85,9 @@ stdenv.mkDerivation rec { "-Ddocs=true" "-Dman=false" # we don't have xmltoman "-Dgstreamer=true" - ]; + "-Dudevrulesdir=lib/udev/rules.d" + ] ++ stdenv.lib.optional nativeHspSupport "-Dbluez5-backend-native=true" + ++ stdenv.lib.optional ofonoSupport "-Dbluez5-backend-ofono=true"; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file