public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pipewire: clean up

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-22 08:49:58 +01:00
parent d04ab628c5
commit 0bf6fb76f5
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/pipewire/default.nix
View File

@ -29,15 +29,13 @@ in stdenv.mkDerivation rec {
alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2 alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2
]; ];
patches = [
./fix-paths.patch
];
mesonFlags = [ mesonFlags = [
"-Denable_docs=true" "-Denable_docs=true"
"-Denable_gstreamer=true" "-Denable_gstreamer=true"
]; ];
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
doCheck = true; doCheck = true;

8
pkgs/development/libraries/pipewire/fix-paths.patch
View File

@ -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)