diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-16 07:43:37 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-16 07:43:37 +0200 |
commit | 3c09808160bd06eeee14bdca462fa9b3ef947271 (patch) | |
tree | 9dda8460a4df5114ea182356d3740a5fcf3a7189 /pkgs/applications/audio | |
parent | 0f01215203e3886d1a57ced4cd49b54475c66f85 (diff) | |
parent | fd2448b2e6ec49808bb3a92e7ad99ac8318bb8e5 (diff) | |
download | nixlib-3c09808160bd06eeee14bdca462fa9b3ef947271.tar nixlib-3c09808160bd06eeee14bdca462fa9b3ef947271.tar.gz nixlib-3c09808160bd06eeee14bdca462fa9b3ef947271.tar.bz2 nixlib-3c09808160bd06eeee14bdca462fa9b3ef947271.tar.lz nixlib-3c09808160bd06eeee14bdca462fa9b3ef947271.tar.xz nixlib-3c09808160bd06eeee14bdca462fa9b3ef947271.tar.zst nixlib-3c09808160bd06eeee14bdca462fa9b3ef947271.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/calf/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/audio/lmms/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/audio/lollypop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/pulseeffects/default.nix | 15 | ||||
-rw-r--r-- | pkgs/applications/audio/radiotray-ng/default.nix | 4 |
5 files changed, 31 insertions, 9 deletions
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 7ff762aa8a0d..94b43fc544ac 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib +{ stdenv, fetchurl, fetchpatch, cairo, expat, fftwSinglePrec, fluidsynth, glib , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib"; }; + patches = [ + # Fix memory leak in limiter + # https://github.com/flathub/com.github.wwmm.pulseeffects/issues/12 + (fetchpatch { + url = https://github.com/calf-studio-gear/calf/commit/7afdefc0d0489a6227fd10f15843d81dc82afd62.patch; + sha256 = "056662iw6hp4ykwk4jyrzg5yarcn17ni97yc060y5kcnzy29ddg6"; + }) + ]; + buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH libglade lv2 pkgconfig diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 25d7f2ed015b..0ff864c0048b 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13 , fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null -, qtbase, qttools, SDL ? null }: +, qtbase, qtx11extras, qttools, SDL ? null }: stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "1.2.0-rc4"; + version = "1.2.0-rc6"; src = fetchFromGitHub { owner = "LMMS"; repo = "lmms"; rev = "v${version}"; - sha256 = "1n3py18zqbvfnkdiz4wc6z60xaajpkd3kn1wxmby5dmc4vccvjj5"; + sha256 = "1pqir5srfrknfd8nmbz565ymq18ffw8d8k9pbmzggaxvlcr12b25"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake qttools pkgconfig ]; @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { libvorbis portaudio qtbase + qtx11extras SDL # TODO: switch to SDL2 in the next version ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index d961393f9ec2..96e1c504373e 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib ] ++ (with gnome3; [ - easytag gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser + gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser ]) ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index a62612a6e0fd..6a1237dd9b36 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -18,8 +18,12 @@ , sord , sratom , libbs2b +, libsamplerate +, libsndfile , boost +, fftwFloat , calf +, zita-convolver , zam-plugins , rubberband , mda_lv2 @@ -36,13 +40,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.1.3"; + version = "4.1.7"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1f89msg8hzaf1pa9w3gaifb88dm0ca2wd81jlz3vr98hm7kxd85k"; + sha256 = "13yj1958jsz76zxi3ag133i4337cicvm5b58l22g2xvbqa5vraq9"; }; nativeBuildInputs = [ @@ -61,11 +65,16 @@ in stdenv.mkDerivation rec { gtk3 gtkmm3 gst_all_1.gstreamer + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad lilv lv2 serd sord sratom libbs2b + libsamplerate + libsndfile boost + fftwFloat + zita-convolver ]; postPatch = '' @@ -74,6 +83,8 @@ in stdenv.mkDerivation rec { ''; preFixup = '' + addToSearchPath GST_PLUGIN_SYSTEM_PATH_1_0 $out/lib/gstreamer-1.0 + gappsWrapperArgs+=( --set LV2_PATH "${stdenv.lib.makeSearchPath "lib/lv2" lv2Plugins}" --set LADSPA_PATH "${stdenv.lib.makeSearchPath "lib/ladspa" ladspaPlugins}" diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 2ce82eb6a0a0..9efd7bb386fb 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { name = "radiotray-ng-${version}"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "0q8k7nsjm6m0r0zs1br60niaqlwvd3myqalb5sqijzanx41aq2l6"; + sha256 = "1sq7bc0dswv3vv56w527z268ib0pyhdxyf25388vnj1fv0c146wc"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; |