From 419fbda8d9c4b0b591e7edf8c32dd4736f12ddee Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 20 Mar 2019 00:43:34 +0000 Subject: [PATCH] pulseaudio-modules-bt: unstable-2019-01-05 -> unstable-2019-03-15 --- .../audio/pulseaudio-modules-bt/default.nix | 6 +++--- .../pulseaudio-modules-bt/fix-install-path.patch | 15 +++------------ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 950b32a8201..b82dad05c31 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { name = "pulseaudio-modules-bt-${version}"; - version = "unstable-2019-01-05"; + version = "unstable-2019-03-15"; src = fetchFromGitHub { owner = "EHfive"; repo = "pulseaudio-modules-bt"; - rev = "4b0cde160c96f40d860fef267a6ded49ae045be0"; - sha256 = "15jw5nf2dhqqdwzyh2x5kdkrq7f3qn140gw6gmspcai9kplhk24w"; + rev = "0b397c26eb4fd5dc611bd3e2baa79776de646856"; + sha256 = "09q0xh9iz0crik6xpln9lijirf62aljxa1jrds1i1zgflyfidd0z"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch index e500d1fb133..3c498fe8af1 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch +++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch @@ -1,20 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d869979..185144d 100644 +index 8d20dbf..63fe7ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -143,13 +143,13 @@ INSTALL(TARGETS +@@ -213,5 +213,4 @@ INSTALL(TARGETS module-bluez5-device module-bluetooth-discover module-bluetooth-policy - LIBRARY DESTINATION ${PulseAudio_modlibexecdir}) +- + 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()