diff options
author | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2020-11-12 22:33:02 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-12 22:33:02 +0000 |
commit | df89889a674d63082b79868d7774c5855cb31461 (patch) | |
tree | 0b026514b2c75bef0d2cfdf1a6af9ea3d9527a33 /pkgs/development | |
parent | fca0aad2586fc9cbe877ac43dec1d7815b74b343 (diff) | |
parent | fd9f28c396f4cb22da8451528bbebbe2dd499687 (diff) |
Merge pull request #102521 from freezeboy/update-vmpk
vmpk: 0.5.1 -> 0.7.2
Diffstat (limited to 'pkgs/development')
3 files changed, 37 insertions, 8 deletions
diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 7cd826b1fe39..5cef17f11196 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, alsaLib, cmake, docbook_xsl, docbook_xml_dtd_45, doxygen -, fluidsynth, pkgconfig, qtbase, qtsvg +{ stdenv, fetchurl +, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook +, alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio }: stdenv.mkDerivation rec { @@ -11,18 +12,25 @@ stdenv.mkDerivation rec { sha256 = "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m"; }; + patches = [ + ./drumstick-fluidsynth.patch + ./drumstick-plugins.patch + ]; + + postPatch = '' + substituteInPlace library/rt/backendmanager.cpp --subst-var out + ''; + outputs = [ "out" "dev" "man" ]; enableParallelBuilding = true; - #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket - postInstall = '' - rm $out/bin/drumstick-vpiano - ''; + nativeBuildInputs = [ + cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook + ]; - nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ]; buildInputs = [ - alsaLib doxygen fluidsynth qtbase qtsvg + alsaLib fluidsynth libpulseaudio qtbase qtsvg ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch b/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch new file mode 100644 index 000000000000..b8cdf63fb649 --- /dev/null +++ b/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch @@ -0,0 +1,9 @@ +It works with fluidsynth 2. + +Backported from r400: https://sourceforge.net/p/drumstick/code/400/ + +--- a/library/rt-backends/CMakeLists.txt ++++ b/library/rt-backends/CMakeLists.txt +@@ -54,1 +54,1 @@ if (PKG_CONFIG_FOUND) +- pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1 fluidsynth<=1.1.11) ++ pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1) diff --git a/pkgs/development/libraries/drumstick/drumstick-plugins.patch b/pkgs/development/libraries/drumstick/drumstick-plugins.patch new file mode 100644 index 000000000000..cbb0a0e34896 --- /dev/null +++ b/pkgs/development/libraries/drumstick/drumstick-plugins.patch @@ -0,0 +1,12 @@ +Make it look for its plugin in its own installation directory. + +--- a/library/rt/backendmanager.cpp ++++ b/library/rt/backendmanager.cpp +@@ -159,6 +159,7 @@ namespace rt { + foreach(const QString& path, QCoreApplication::libraryPaths()) { + d->appendDir( path + QDir::separator() + QSTR_DRUMSTICK, result ); + } ++ d->appendDir( "@out@/lib/drumstick", result ); + return result; + } + |