diff options
| author | Luka Blaskovic <lblasc@tvbeat.com> | 2020-01-18 14:55:19 +0000 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-30 18:35:29 -0500 |
| commit | 4fa34c2283c859be60da2a054efd87cf91514373 (patch) | |
| tree | 9ec88492ba9fdc99b28d089d72e3e6e09ea41f86 /pkgs | |
| parent | 1ebc042878132a31f80b76938c47c0bee2932487 (diff) | |
| download | nixlib-4fa34c2283c859be60da2a054efd87cf91514373.tar nixlib-4fa34c2283c859be60da2a054efd87cf91514373.tar.gz nixlib-4fa34c2283c859be60da2a054efd87cf91514373.tar.bz2 nixlib-4fa34c2283c859be60da2a054efd87cf91514373.tar.lz nixlib-4fa34c2283c859be60da2a054efd87cf91514373.tar.xz nixlib-4fa34c2283c859be60da2a054efd87cf91514373.tar.zst nixlib-4fa34c2283c859be60da2a054efd87cf91514373.zip | |
llvm-general: remove
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9a293de7712a..b2c65b7f03a8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -282,20 +282,6 @@ self: super: builtins.intersectAttrs super { # Uses OpenGL in testing caramia = dontCheck super.caramia; - llvm-general = - # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142 - let base = 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 []; - } - ); - llvm-hs = let llvmHsWithLlvm8 = super.llvm-hs.override { llvm-config = pkgs.llvm_8; }; in |