Skip to content

Commit feab76c

Browse files
committed
FromCabal: remove LLVM evil
There is no reason to tie use of LLVM libraries to the LLVM version used by GHC’s LLVM backend, especially as the LLVM backend is usually not being used. Also, `libclang` is the correct dependency for Clang used as a library, rather than the wrapped `clang` tool. (In practice, though, this doesn’t really help: the packages this changes in Nixpkgs are already broken because they depend on ancient LLVMs, want the `llvm-config(1)` tool that is in the `llvm` package, and in one of the two cases the `Setup.hs` doesn’t even build with modern Cabal.)
1 parent 4b23197 commit feab76c

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
172172

173173
resolveInNixpkgs :: Identifier -> Binding
174174
resolveInNixpkgs i
175-
| i `elem` ["clang","lldb","llvm"] = binding # (i, path # ["self","llvmPackages",i]) -- TODO: evil!
175+
| i == "clang" = binding # (i, path # ["pkgs","libclang"])
176176
| i == "gtk2" = binding # (i, path # ["pkgs","gtk2"]) -- TODO: these cases should not be necessary
177177
| i == "gtk3" = binding # (i, path # ["pkgs","gtk3"])
178178
| i == "gtksourceview3" = binding # (i, path # ["pkgs","gtksourceview3"])

0 commit comments

Comments
 (0)