From 388c29fb2f5944fa61800064b7133c69b01157df Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 9 Jun 2019 12:25:30 +0200 Subject: [PATCH] llvmlite: fix build --- pkgs/development/python-modules/llvmlite/default.nix | 5 +++++ pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 0f906566e42..b22839b19ad 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -28,6 +28,11 @@ buildPythonPackage rec { substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" + + # llvm 7.1 is not officially supported but works fine. + # Remove when going to 0.29.0 / llvm 8 + substituteInPlace ffi/build.py --replace "7.0." "7." + substituteInPlace llvmlite/tests/test_binding.py --replace "test_version" "dont_test_version" ''; # Set directory containing llvm-config binary preConfigure = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61801eee158..f0f1f1322e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3239,7 +3239,7 @@ in { locustio = callPackage ../development/python-modules/locustio { }; - llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_6; }; + llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_7; }; lockfile = callPackage ../development/python-modules/lockfile { };