faust2: 2.0-a41 -> 2.0.a51

pkgs/applications/audio/faust/faust2.nix

@@ -16,11 +16,11 @@ with stdenv.lib.strings;
 
 let
 
-  version = "2.0-a41";
+  version = "2.0.a51";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/faudiostream/faust-2.0.a41.tgz";
-    sha256 = "1cq4x1cax0lswrcqv0limx5mjdi3187zlmh7cj2pndr0xq6b96cm";
+    url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz";
+    sha256 = "1yryjqfqmxs7lxy95hjgmrncvl9kig3rcsmg0v49ghzz7vs7haxf";
   };
 
   meta = with stdenv.lib; {
@@ -53,7 +53,7 @@ let
       # defines 'system' env var, so undefine that so faust detects the
       # correct system.
       unset system
-      sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix
+      # sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix
 
       # The makefile sets LLVM_<version> depending on the current llvm
       # version, but the detection code is quite brittle.
@@ -67,7 +67,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.7.0' -i compiler/Makefile.unix
+      sed '52iLLVM_VERSION=3.8.0' -i compiler/Makefile.unix
     '';
 
     # Remove most faust2appl scripts since they won't run properly
@@ -151,7 +151,8 @@ let
         for script in "$out"/bin/*; do
           substituteInPlace "$script" \
             --replace ". faustpath" ". '${faust}/bin/faustpath'" \
-            --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'"
+            --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" \
+            --replace " error " "echo"
         done
       '';
 
@@ -193,7 +194,9 @@ 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 FAUSTINC "${faust}/include/faust" \
             --prefix PATH : "$PATH" \
             --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \
             --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \