diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 08:49:58 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 10:32:24 +0100 |
| commit | 0bf6fb76f5ec8e218b5d93bbb3ef50ee22cb0827 (patch) | |
| tree | 1f4f68152ec9884cd598db398a5caf1de887eabd /pkgs | |
| parent | d04ab628c515910c709c5bac03a7b53506bf0325 (diff) | |
| download | nixpkgs-0bf6fb76f5ec8e218b5d93bbb3ef50ee22cb0827.tar nixpkgs-0bf6fb76f5ec8e218b5d93bbb3ef50ee22cb0827.tar.gz nixpkgs-0bf6fb76f5ec8e218b5d93bbb3ef50ee22cb0827.tar.bz2 nixpkgs-0bf6fb76f5ec8e218b5d93bbb3ef50ee22cb0827.tar.lz nixpkgs-0bf6fb76f5ec8e218b5d93bbb3ef50ee22cb0827.tar.xz nixpkgs-0bf6fb76f5ec8e218b5d93bbb3ef50ee22cb0827.tar.zst nixpkgs-0bf6fb76f5ec8e218b5d93bbb3ef50ee22cb0827.zip | |
pipewire: clean up
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/pipewire/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/pipewire/fix-paths.patch | 8 |
2 files changed, 2 insertions, 12 deletions
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) - |