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

Merge pull request #42174 from obsidiansystems/darwin-clang-manpage

Browse Source 
darwin stdenv: Put back "man" attribute on clang and llvm
This commit is contained in:
John Ericson
2018-06-18 15:07:48 -04:00
committed by GitHub
parent 42a88a43c9 627aae5884
commit e09c6e47f1
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/stdenv/darwin/default.nix
View File

@@ -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 ];