movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

treewide: generate pulseaudio pulseDir

Browse source
This commit is contained in:
Edmund Wu 2020-10-25 21:18:26 -04:00 • committed by Gabriel Ebner
parent 33784354b9
commit 0e4d0d95d0
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/config/pulseaudio.nix
View file

@ -259,7 +259,7 @@ in {
(drv: drv.override { pulseaudio = overriddenPackage; }) (drv: drv.override { pulseaudio = overriddenPackage; })
cfg.extraModules; cfg.extraModules;
modulePaths = builtins.map modulePaths = builtins.map
(drv: "${drv}/lib/pulse-${overriddenPackage.version}/modules") (drv: "${drv}/${overriddenPackage.pulseDir}/modules")
# User-provided extra modules take precedence # User-provided extra modules take precedence
(overriddenModules ++ [ overriddenPackage ]); (overriddenModules ++ [ overriddenPackage ]);
in lib.concatStringsSep ":" modulePaths; in lib.concatStringsSep ":" modulePaths;

4
pkgs/applications/audio/pulseaudio-modules-bt/default.nix
View file

@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
# Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions
substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version} substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version}
substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version} substituteInPlace CMakeLists.txt --replace '${"\${PULSE_DIR}"}' ${pulseaudio.pulseDir}
# Fraunhofer recommends to enable afterburner but upstream has it set to false by default # Fraunhofer recommends to enable afterburner but upstream has it set to false by default
substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \ substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \
@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
orig_rpath=$(patchelf --print-rpath "$so") orig_rpath=$(patchelf --print-rpath "$so")
patchelf \ patchelf \
--set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/${pulseaudio.pulseDir}/modules:$orig_rpath" \
"$so" "$so"
done done
''; '';

2
pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
View file

@ -8,4 +8,4 @@ index 8d20dbf..63fe7ba 100644
module-bluetooth-policy module-bluetooth-policy
- LIBRARY DESTINATION ${PulseAudio_modlibexecdir}) - LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
- -
+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/) + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PULSE_DIR}/modules/)

4
pkgs/servers/pulseaudio/default.nix
View file

@ -124,6 +124,10 @@ stdenv.mkDerivation rec {
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
''; '';
passthru = {
pulseDir = "lib/pulse-" + lib.versions.majorMinor version;
};
meta = { meta = {
description = "Sound server for POSIX and Win32 systems"; description = "Sound server for POSIX and Win32 systems";
homepage = "http://www.pulseaudio.org/"; homepage = "http://www.pulseaudio.org/";