diff options
| author | Bart Brouns <bart@magnetophon.nl> | 2017-06-15 01:42:55 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-06-19 09:37:48 +0200 |
| commit | d454675ef6e6d06a933ce471c3ff69643138a1a8 (patch) | |
| tree | f838906c9e2beff321bbbe82cba2b9feb0b96b04 /pkgs/applications/audio/faust | |
| parent | 629e9c6dc770c7ff293b25e10fea2c0b301b2dde (diff) | |
| download | nixpkgs-d454675ef6e6d06a933ce471c3ff69643138a1a8.tar nixpkgs-d454675ef6e6d06a933ce471c3ff69643138a1a8.tar.gz nixpkgs-d454675ef6e6d06a933ce471c3ff69643138a1a8.tar.bz2 nixpkgs-d454675ef6e6d06a933ce471c3ff69643138a1a8.tar.lz nixpkgs-d454675ef6e6d06a933ce471c3ff69643138a1a8.tar.xz nixpkgs-d454675ef6e6d06a933ce471c3ff69643138a1a8.tar.zst nixpkgs-d454675ef6e6d06a933ce471c3ff69643138a1a8.zip | |
faust: 2.0.a51 -> 2.1.0
Diffstat (limited to 'pkgs/applications/audio/faust')
| -rw-r--r-- | pkgs/applications/audio/faust/faust2.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 6289688c53c..274f7c9c3b8 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -1,6 +1,6 @@ { stdenv , coreutils -, fetchurl +, fetchFromGitHub , makeWrapper , pkgconfig , clang @@ -16,11 +16,13 @@ with stdenv.lib.strings; let - version = "2.0.a51"; + version = "2.1.0"; - src = fetchurl { - url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; - sha256 = "1yryjqfqmxs7lxy95hjgmrncvl9kig3rcsmg0v49ghzz7vs7haxf"; + src = fetchFromGitHub { + owner = "grame-cncm"; + repo = "faust"; + rev = "v${builtins.replaceStrings ["."] ["-"] version}"; + sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m"; }; meta = with stdenv.lib; { @@ -67,7 +69,7 @@ let # # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION # to something the makefile will recognize. - sed '52iLLVM_VERSION=3.8.0' -i compiler/Makefile.unix + sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix ''; # Remove most faust2appl scripts since they won't run properly @@ -194,8 +196,8 @@ let # export parts of the build environment for script in "$out"/bin/*; do wrapProgram "$script" \ - --set FAUSTLIB "${faust}/lib/faust" \ - --set FAUST_LIB_PATH "${faust}/lib/faust" \ + --set FAUSTLIB "${faust}/share/faust" \ + --set FAUST_LIB_PATH "${faust}/share/faust" \ --set FAUSTINC "${faust}/include/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ |