faust2: 2.81.10 -> 2.83.1, unpin LLVM (#471911)
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
libsndfile,
|
||||
libsamplerate,
|
||||
@@ -36,6 +37,14 @@ stdenv.mkDerivation {
|
||||
sha256 = "sha256-NDYltwmjBsX1DWCjy8/4cXMSl3/mK+HaQHSKUmRR9TI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix typo that breaks build
|
||||
(fetchpatch {
|
||||
url = "https://github.com/csound/csound/commit/bb9bafcfa17a87d3733eda1e25a812fd0be08ac6.diff";
|
||||
hash = "sha256-0M047uALPAoyQP0LbfBAybb2DWQ2/6QwZXxUjs1O1fE=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_CSOUND_AC=0"
|
||||
] # fails to find Score.hpp
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
cmake,
|
||||
llvm_18, # does not build with 19+ due to API changes
|
||||
llvm,
|
||||
emscripten,
|
||||
openssl,
|
||||
libsndfile,
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
let
|
||||
|
||||
version = "2.81.10";
|
||||
version = "2.83.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grame-cncm";
|
||||
repo = "faust";
|
||||
tag = version;
|
||||
hash = "sha256-xmaZY1jFIZQjWlQkJ+uHC4tY4pFPLJ+fKSbktIZkBFI=";
|
||||
hash = "sha256-DojqKLoGb6aGpqpeTAXyLFsbWs/UgYr9nA+JMGa712A=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -65,7 +65,7 @@ let
|
||||
which
|
||||
];
|
||||
buildInputs = [
|
||||
llvm_18
|
||||
llvm
|
||||
emscripten
|
||||
openssl
|
||||
libsndfile
|
||||
@@ -81,7 +81,7 @@ let
|
||||
|
||||
preConfigure = ''
|
||||
# include llvm-config in path
|
||||
export PATH="${lib.getDev llvm_18}/bin:$PATH"
|
||||
export PATH="${lib.getDev llvm}/bin:$PATH"
|
||||
cd build
|
||||
|
||||
''
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
gettext,
|
||||
makeWrapper,
|
||||
@@ -25,6 +26,12 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
# expose error function used by dependents
|
||||
./expose-error.patch
|
||||
|
||||
# Fix build with GCC 15
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pure-data/pure-data/commit/95e4105bc1044cbbcbbbcc369480a77c298d7475.patch";
|
||||
hash = "sha256-zFB9m8Nw80X9+a64Uft4tNRA4BHsVr8zxLqAof0jJEI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -49,6 +49,12 @@ mkDerivation rec {
|
||||
url = "https://github.com/supercollider/supercollider/commit/7d1f3fbe54e122889489a2f60bbc6cd6bb3bce28.patch";
|
||||
hash = "sha256-gyE0B2qTbj0ppbLlYTMa2ooY3FHzzIrdrpWYr81Hy1Y=";
|
||||
})
|
||||
|
||||
# Fixes the build with GCC 15
|
||||
(fetchpatch {
|
||||
url = "https://github.com/supercollider/supercollider/commit/edfac5e24959b12286938a9402326e521c2d2b63.patch";
|
||||
hash = "sha256-8DNCO5VEX6V0Q29A/v5tFC7u835bwNHvcNlZzmS0ADg=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/supercollider/sc3-plugins/commit/3dc56bf7fcc1f2261afc13f96da762b78bcbfa51.patch";
|
||||
hash = "sha256-lvXvGunfmjt6i+XPog14IKdnH1Qk8vefxplSDkXXXHU=";
|
||||
})
|
||||
|
||||
# Fix build with GCC 15
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/supercollider/sc3-plugins/commit/deaa55a7204bedf65a2000a463ae87a481bf3eb8.patch";
|
||||
hash = "sha256-d8+4ZmedAwVt/AlU/YKqQF+80shEa8DiPnvMwJtW/RM=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
Reference in New Issue
Block a user