summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@yahoo.com>2018-06-18 15:07:48 -0400
committerGitHub <noreply@github.com>2018-06-18 15:07:48 -0400
commite09c6e47f1a526f185f2e3318d0da4cc97c36129 (patch)
treee1cce322d5bf487fc2271cdf3457c9ad859c85ee
parent42a88a43c969b12a9b2577a0eb8737b71eedf903 (diff)
parent627aae5884fd9bc2b380eab818f58212aa8753f1 (diff)
downloadnixlib-e09c6e47f1a526f185f2e3318d0da4cc97c36129.tar
nixlib-e09c6e47f1a526f185f2e3318d0da4cc97c36129.tar.gz
nixlib-e09c6e47f1a526f185f2e3318d0da4cc97c36129.tar.bz2
nixlib-e09c6e47f1a526f185f2e3318d0da4cc97c36129.tar.lz
nixlib-e09c6e47f1a526f185f2e3318d0da4cc97c36129.tar.xz
nixlib-e09c6e47f1a526f185f2e3318d0da4cc97c36129.tar.zst
nixlib-e09c6e47f1a526f185f2e3318d0da4cc97c36129.zip
Merge pull request #42174 from obsidiansystems/darwin-clang-manpage
darwin stdenv: Put back "man" attribute on clang and llvm
-rw-r--r--pkgs/stdenv/darwin/default.nix15
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 7ef74c5ea7df..71de45bb1d72 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -323,8 +323,16 @@ in rec {
         coreutils findutils diffutils patchutils;
 
       llvmPackages_5 = super.llvmPackages_5 // (let
-        tools = super.llvmPackages_5.tools.extend (_: _: {
-          inherit (llvmPackages_5) llvm clang-unwrapped;
+        tools = super.llvmPackages_5.tools.extend (_: super: {
+          # Build man pages with final stdenv not before
+          llvm = lib.extendDerivation
+            true
+            { inherit (super.llvm) man; }
+            llvmPackages_5.llvm;
+          clang-unwrapped = lib.extendDerivation
+            true
+            { inherit (super.clang-unwrapped) man; }
+            llvmPackages_5.clang-unwrapped;
         });
         libraries = super.llvmPackages_5.libraries.extend (_: _: {
           inherit (llvmPackages_5) libcxx libcxxabi;
@@ -370,7 +378,8 @@ in rec {
         inherit (prevStage) stdenv;
       };
       inherit (pkgs) coreutils gnugrep;
-      cc       = pkgs.llvmPackages.clang-unwrapped;
+      # Hack to avoid man pages in stdenv to avoid mass rebuild
+      cc       = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ];
       bintools = pkgs.darwin.binutils;
       libc     = pkgs.darwin.Libsystem;
       extraPackages = [ pkgs.libcxx ];