public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.llvm-general-darwin: fix #23794

Browse Source 
by hiding under llvm-general.  There seems no use in a separately named
attribute.  The derivations are unchanged.
This commit is contained in:
Vladimír Čunát 2017-03-12 18:17:53 +01:00
parent beb2a2f63d
commit 69448187a4
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -216,20 +216,19 @@ self: super: builtins.intersectAttrs super {
# Uses OpenGL in testing # Uses OpenGL in testing
caramia = dontCheck super.caramia; 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 = llvm-general =
if pkgs.stdenv.isDarwin # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142
then self.llvm-general-darwin let base = super.llvm-general.override { llvm-config = pkgs.llvm_35; };
else super.llvm-general.override { llvm-config = pkgs.llvm_35; }; in if !pkgs.stdenv.isDarwin then base else overrideCabal base (
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 [];
}
);
# Needs help finding LLVM. # Needs help finding LLVM.
spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;