about summary refs log tree commit diff
path: root/pkgs/applications/audio
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-05-21 17:44:15 +0200
committerUli Baum <xeji@cat3.de>2018-06-05 23:01:44 +0200
commit44f3a1dd41bc6ec78d827bb2aa5997a4cb67be70 (patch)
treee2302ae154b8084304bc8fe0d6a0e2b822175fce /pkgs/applications/audio
parent16845d61e8b97a6f955eb65aff30a87dc2f33c68 (diff)
downloadnixlib-44f3a1dd41bc6ec78d827bb2aa5997a4cb67be70.tar
nixlib-44f3a1dd41bc6ec78d827bb2aa5997a4cb67be70.tar.gz
nixlib-44f3a1dd41bc6ec78d827bb2aa5997a4cb67be70.tar.bz2
nixlib-44f3a1dd41bc6ec78d827bb2aa5997a4cb67be70.tar.lz
nixlib-44f3a1dd41bc6ec78d827bb2aa5997a4cb67be70.tar.xz
nixlib-44f3a1dd41bc6ec78d827bb2aa5997a4cb67be70.tar.zst
nixlib-44f3a1dd41bc6ec78d827bb2aa5997a4cb67be70.zip
faust2: fix build with llvm 5.0.2 (#40672)
build was broken by  llvm: 5.0.1 -> 5.0.2 (#39979)

(cherry picked from commit a16c31244b904cb0ee152eca2c0c01c3be0fdc7f)
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r--pkgs/applications/audio/faust/faust2.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index db5433cc35fc..961ef7135697 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -73,6 +73,13 @@ let
       sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix
     '';
 
+    postPatch = ''
+      # fix build with llvm 5.0.2 by adding it to the list of known versions
+      # TODO: check if still needed on next update
+      substituteInPlace compiler/Makefile.unix \
+        --replace "5.0.0 5.0.1" "5.0.0 5.0.1 5.0.2"
+    '';
+
     # Remove most faust2appl scripts since they won't run properly
     # without additional paths setup. See faust.wrap,
     # faust.wrapWithBuildEnv.
@@ -193,6 +200,7 @@ let
 
       propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
 
+
       postFixup = ''
 
         # export parts of the build environment