From 0bf6fb76f5ec8e218b5d93bbb3ef50ee22cb0827 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 22 Mar 2018 08:49:58 +0100 Subject: [PATCH] pipewire: clean up --- pkgs/development/libraries/pipewire/default.nix | 6 ++---- pkgs/development/libraries/pipewire/fix-paths.patch | 8 -------- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 pkgs/development/libraries/pipewire/fix-paths.patch diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 90174bf749a..57580de2401 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -29,15 +29,13 @@ in stdenv.mkDerivation rec { alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2 ]; - patches = [ - ./fix-paths.patch - ]; - mesonFlags = [ "-Denable_docs=true" "-Denable_gstreamer=true" ]; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file doCheck = true; diff --git a/pkgs/development/libraries/pipewire/fix-paths.patch b/pkgs/development/libraries/pipewire/fix-paths.patch deleted file mode 100644 index 5a07c6271e1..00000000000 --- a/pkgs/development/libraries/pipewire/fix-paths.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/src/daemon/systemd/user/meson.build -+++ b/src/daemon/systemd/user/meson.build -@@ -1,4 +1,4 @@ --systemd_user_services_dir = systemd.get_pkgconfig_variable('systemduserunitdir') -+systemd_user_services_dir = join_paths(get_option('prefix'), 'etc', 'systemd', 'user') - - install_data(sources : 'pipewire.socket', install_dir : systemd_user_services_dir) -