From 0540a837893f1e32676fe2a9b093216b44f5dc24 Mon Sep 17 00:00:00 2001 From: Dave Laing Date: Fri, 13 May 2016 09:26:31 +1000 Subject: [PATCH] llvm-general: Adds Darwin compatibilty --- .../haskell-modules/configuration-common.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5f1335ca72fb..ca96d057574a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -615,8 +615,20 @@ self: super: { # Uses OpenGL in testing caramia = dontCheck super.caramia; + llvm-general-darwin = overrideCabal (super.llvm-general.override { llvm-config = pkgs.llvm_35; }) (drv: { + preConfigure = '' + sed -i llvm-general.cabal \ + -e 's,extra-libraries: stdc++,extra-libraries: c++,' + ''; + configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"]; + librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or []; + }); + # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142 - llvm-general = super.llvm-general.override { llvm-config = pkgs.llvm_35; }; + llvm-general = + if pkgs.stdenv.isDarwin + then self.llvm-general-darwin + else super.llvm-general.override { llvm-config = pkgs.llvm_35; }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;