diff options
| author | Bart Brouns <bart@magnetophon.nl> | 2020-03-26 08:32:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 07:32:01 +0000 |
| commit | bbe762417591541bc1dcd30c1eab41dfebfb9359 (patch) | |
| tree | 1838448de40002fe61496f0c311e43da8b604a2e | |
| parent | c7fc0ed352091fcb45e1a8e120c3c99b7f47faea (diff) | |
| download | nixpkgs-bbe762417591541bc1dcd30c1eab41dfebfb9359.tar nixpkgs-bbe762417591541bc1dcd30c1eab41dfebfb9359.tar.gz nixpkgs-bbe762417591541bc1dcd30c1eab41dfebfb9359.tar.bz2 nixpkgs-bbe762417591541bc1dcd30c1eab41dfebfb9359.tar.lz nixpkgs-bbe762417591541bc1dcd30c1eab41dfebfb9359.tar.xz nixpkgs-bbe762417591541bc1dcd30c1eab41dfebfb9359.tar.zst nixpkgs-bbe762417591541bc1dcd30c1eab41dfebfb9359.zip | |
faust2: 2.20.2 -> unstable-2020-03-20 (#82650)
The latest release has a bug that makes it unable to compile all of its own libraries: https://github.com/grame-cncm/faust/issues/406
4 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 74a5f4d383d..cca0e21f835 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with stdenv.lib.strings; let - version = "2.20.2"; + version = "unstable-2020-03-20"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = version; - sha256 = "08hv8gyj6c83128z3si92r1ka5ckf9sdpn5jdnlhrqyzja4mrxsy"; + rev = "2782088d4485f1c572755f41e7a072b41cb7148a"; + sha256 = "1l7bi2mq10s5wm8g4cdipg8gndd478x897qv0h7nqi1s2q9nq99p"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 5a015e5ca31..144d19cb01e 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -3,6 +3,7 @@ , opencv , qt4 , libsndfile +, which }: faust.wrapWithBuildEnv { @@ -19,6 +20,7 @@ faust.wrapWithBuildEnv { opencv qt4 libsndfile + which ]; } diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix index 3472ce5047e..51d956b1403 100644 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ b/pkgs/applications/audio/faust/faust2lv2.nix @@ -2,6 +2,7 @@ , faust , lv2 , qt4 +, which }: @@ -9,6 +10,6 @@ faust.wrapWithBuildEnv { baseName = "faust2lv2"; - propagatedBuildInputs = [ boost lv2 qt4 ]; + propagatedBuildInputs = [ boost lv2 qt4 which ]; } diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index fece392ab1c..735e7efe54d 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' + echo "hack out autoComp.dsp due to https://github.com/grame-cncm/faust/407/issues " + rm autoComp.dsp for f in *.dsp; do echo "compiling standalone from" $f |