diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:20:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:21:06 +0000 |
commit | a42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (patch) | |
tree | 7d481fea9872f62a034452612be17f4494159baa /nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix | |
parent | 55f69a6b0e53c1c4b3e0396937c53bf5662b5519 (diff) | |
parent | 9480bae337095fd24f61380bce3174fdfe926a00 (diff) | |
download | nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.gz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.bz2 nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.lz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.xz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.zst nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.zip |
Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'
This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
Diffstat (limited to 'nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 2511cf0f20a5..556dd5f10619 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pulseaudio , pkgconfig -, ffmpeg_4 +, ffmpeg , patchelf , fdk_aac , libtool @@ -24,18 +24,17 @@ let in stdenv.mkDerivation rec { pname = "pulseaudio-modules-bt"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "EHfive"; repo = "pulseaudio-modules-bt"; rev = "v${version}"; - sha256 = "00xmidcw4fvpbmg0nsm2gk5zw26fpyjbc0pjk6mzr570zbnyqqbn"; + sha256 = "0bzg6x405j39axnkvc6n6vkl1hv1frk94y1i9sl170081bk23asd"; }; patches = [ ./fix-install-path.patch - ./fix-aac-defaults.patch ]; nativeBuildInputs = [ @@ -46,7 +45,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pulseaudio - ffmpeg_4 + ffmpeg fdk_aac libtool ldacbt @@ -63,13 +62,17 @@ in stdenv.mkDerivation rec { # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version} substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version} + + # Fraunhofer recommends to enable afterburner but upstream has it set to false by default + substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \ + --replace "info->aac_afterburner = false;" "info->aac_afterburner = true;" ''; postFixup = '' for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ + --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ "$so" done ''; |