Merge pull request #26818 from LnL7/llvm-manpages

llvm-packages: get rid of extra build depedencies for manpages
2017-06-26 21:40:55 +02:00
parent b686fd1570 071803955e
commit d76bc8ed15
4 changed files with 26 additions and 15 deletions
@@ -235,11 +235,11 @@ in rec {
      libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep
      coreutils findutils diffutils patchutils;

-    llvmPackages = let llvmOverride = llvmPackages.llvm.override { enableManpages = false; inherit libcxxabi; }; in
-      super.llvmPackages // {
-        llvm = llvmOverride;
-        clang-unwrapped = llvmPackages.clang-unwrapped.override { enableManpages = false; llvm = llvmOverride; };
-      };
+     llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; };
+     in super.llvmPackages // {
+       llvm = llvmOverride;
+       clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; };
+     };

    darwin = super.darwin // {
      inherit (darwin) dyld Libsystem libiconv locale;