diff options
| author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-01-25 19:45:09 +0000 |
|---|---|---|
| committer | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-01-25 19:46:15 +0000 |
| commit | ebde9f932113ac20bb3526d644e4d3d04a96e9d6 (patch) | |
| tree | 00afb57a1ae1e265a4a6a56cdc96c49dd5d2d4d9 /pkgs/applications/audio/faust | |
| parent | 02cc697a7c89237ee3d3f4ae0cec116cbff202be (diff) | |
faustlive: unpin llvm, fix build, fix runtime
Diffstat (limited to 'pkgs/applications/audio/faust')
| -rw-r--r-- | pkgs/applications/audio/faust/faustlive.nix | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 375ecfbbea043..1d91f561c044b 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,25 +1,25 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , which , alsa-lib -, bc -, coreutils , curl , faust , flac , gnutls , libjack2 , libmicrohttpd +, libmpg123 , libogg , libopus , libsndfile , libtasn1 , libvorbis , libxcb -, llvm_10 +, llvm , p11-kit , qrencode , qt5 @@ -32,44 +32,55 @@ stdenv.mkDerivation rec { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-RqtdDkP63l/30sL5PDocvpar5TI4LdKfeeliSNeOHog="; + hash = "sha256-RqtdDkP63l/30sL5PDocvpar5TI4LdKfeeliSNeOHog="; fetchSubmodules = true; }; + patches = [ + # move mutex initialization outside assert call + # https://github.com/grame-cncm/faustlive/pull/59 + (fetchpatch { + name = "initalize-mutexes.patch"; + url = "https://github.com/grame-cncm/faustlive/commit/fdd46b12202def9731b9ed2f6363287af16be892.patch"; + hash = "sha256-yH95Y4Jbqgs8siE9rtutmu5C2sNZwQMJzCgDYqNBDj4="; + }) + ]; + + strictDeps = true; + nativeBuildInputs = [ cmake + faust + llvm pkg-config qt5.wrapQtAppsHook + which ]; buildInputs = [ alsa-lib - bc - coreutils curl faust flac gnutls libjack2 libmicrohttpd + libmpg123 libogg libopus libsndfile libtasn1 libvorbis libxcb - llvm_10 + llvm p11-kit qrencode qt5.qtbase - which ]; - makeFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - wrapProgram $out/bin/FaustLive --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libmicrohttpd libsndfile faust llvm_10 ]}" - ''; + cmakeFlags = [ + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" + ]; postPatch = "cd Build"; |