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

pulseaudio-modules-bt: unstable-2018-10-16 -> unstable-2018-11-01

This commit is contained in:
adisbladis 2018-11-04 14:14:16 +00:00
parent 6795bdd58c
commit 965ae0246a
No known key found for this signature in database
GPG Key ID: ED58F95069B004F5
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/audio/pulseaudio-modules-bt/default.nix
View File

@ -5,6 +5,7 @@
, pkgconfig , pkgconfig
, ffmpeg_4 , ffmpeg_4
, patchelf , patchelf
, fdk_aac
, libtool , libtool
, cmake , cmake
, bluez , bluez
@ -22,13 +23,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "pulseaudio-modules-bt-${version}"; name = "pulseaudio-modules-bt-${version}";
version = "unstable-2018-10-16"; version = "unstable-2018-11-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EHfive"; owner = "EHfive";
repo = "pulseaudio-modules-bt"; repo = "pulseaudio-modules-bt";
rev = "552c2b48c0cc7dd44d0746b261f7c7d5559e8e30"; rev = "a2f62fcaa702bb883c07d074ebca8d7135520ab8";
sha256 = "052jb1hjx1in7bafx4zpn78s7r6f2y7djriwi36dzqy9wmalmyjy"; sha256 = "1fhg7q9064zikhy0xxldn4fvh49pc47mgikcbd9yhsk66gcn6zj3";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -45,6 +46,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pulseaudio pulseaudio
ffmpeg_4 ffmpeg_4
fdk_aac
libtool libtool
bluez bluez
dbus dbus
@ -72,7 +74,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/EHfive/pulseaudio-modules-bt; homepage = https://github.com/EHfive/pulseaudio-modules-bt;
description = "SBC, Sony LDAC codec (A2DP Audio) support for Pulseaudio"; description = "LDAC, aptX, aptX HD, AAC codecs (A2DP Audio) support for Linux PulseAudio";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ adisbladis ]; maintainers = with maintainers; [ adisbladis ];

15
pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
View File

@ -1,11 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f5baa0..1f35cce 100644 index d869979..185144d 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -122,5 +121,4 @@ INSTALL(TARGETS @@ -143,13 +143,13 @@ INSTALL(TARGETS
module-bluez5-device module-bluez5-device
module-bluetooth-discover module-bluetooth-discover
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}/lib/pulse-${PulseAudio_VERSION}/modules/)
if(NOT ${HAVE_SYSTEM_LDAC})
INSTALL(TARGETS
ldacBT_enc
ldacBT_abr
- LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)
endif()