diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-01 12:01:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-01 12:01:16 +0000 |
commit | b4cd84e42197cea3f2ddc8d047158d2980f0abef (patch) | |
tree | ec07067ec28dcb2e1bc8f32f06c3e96acb396924 /pkgs/applications/audio | |
parent | dc0ace8d6e9a9cba3de29a6888a5e6d259f94843 (diff) | |
parent | 7c43c4cc0a8b7c0d7d583ae16f335a91f1ac9f8a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/cardinal/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/audio/faust/faust2.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/faust/faustlive.nix | 21 |
3 files changed, 13 insertions, 25 deletions
diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 1e77ade6cdb42..a1db5bb275bbb 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -23,23 +23,14 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.02"; + version = "22.04"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz"; - sha256 = "sha256-IVlAROFGFffTEU00NCmv74w1DRb7dNMp20FeBVoDrdM="; + sha256 = "sha256-7As4CckwByrTynOOpwAXa1R9Bpp/ft537f+PvAgz/BE="; }; - patches = [ - # see https://github.com/DISTRHO/Cardinal/issues/151#issuecomment-1041886260 - (fetchpatch { - url = - "https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch"; - sha256 = "sha256-NYUYLbLeBX1WEzjPi0s/T1N+EXQKyi0ifbPxgBYDjRs="; - }) - ]; - prePatch = '' patchShebangs ./dpf/utils/generate-ttl.sh ''; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 0309031cf7858..2ad98d3d6d8d8 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with lib.strings; let - version = "2.37.3"; + version = "2.40.0"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-Jzauw8+vBjtbK73Bh4huhX1ql1cWmh80EzEET3x03rc="; + sha256 = "sha256-IsrLaoMDwrDPxtqCXIy/7tZCdogTUkJ00obSco9SR/A="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 46d63c84314b3..38d3bafdea6a5 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,37 +1,34 @@ { lib, stdenv, fetchFromGitHub , llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsa-lib, faust, curl -, bc, coreutils, which, libsndfile, pkg-config, libxcb +, bc, coreutils, which, libsndfile, flac, libogg, libvorbis, libopus, pkg-config, libxcb, cmake, gnutls, libtasn1, p11-kit }: stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.5"; + version = "2.5.8"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "0qbn05nq170ckycwalkk5fppklc4g457mapr7p7ryrhc1hwzffm9"; + sha256 = "sha256-dt5YlvaCZ6JiNGPwVXPrKzVGWxnhdyP4lnKgck7ZSF8="; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook cmake ]; buildInputs = [ llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsa-lib faust curl - bc coreutils which libsndfile libxcb + bc coreutils which libsndfile flac libogg libvorbis libopus libxcb gnutls libtasn1 p11-kit ]; makeFlags = [ "PREFIX=$(out)" ]; - postPatch = "cd Build"; - - installPhase = '' - install -d "$out/bin" - install -d "$out/share/applications" - install FaustLive/FaustLive "$out/bin" - install rsrc/FaustLive.desktop "$out/share/applications" + postInstall = '' + wrapProgram $out/bin/FaustLive --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libmicrohttpd libsndfile faust llvm_10 ]}" ''; + postPatch = "cd Build"; + meta = with lib; { description = "A standalone just-in-time Faust compiler"; longDescription = '' |