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

Merge pull request #26818 from LnL7/llvm-manpages

Browse Source 
llvm-packages: get rid of extra build depedencies for manpages
This commit is contained in:
Daiderd Jordan 2017-06-26 21:40:55 +02:00 committed by GitHub
commit d76bc8ed15
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/4/clang/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python { stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
, fixDarwinDylibNames , fixDarwinDylibNames
, enableManpages ? true , enableManpages ? false
}: }:
let let

27
pkgs/development/compilers/llvm/4/default.nix
View File

@ -1,4 +1,4 @@
{ newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }: { lowPrio, newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
let let
callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
@ -13,14 +13,25 @@ let
compiler-rt_src = fetch "compiler-rt" "059ipqq27gd928ay06f1ck3vw6y5h5z4zd766x8k0k7jpqimpwnk"; compiler-rt_src = fetch "compiler-rt" "059ipqq27gd928ay06f1ck3vw6y5h5z4zd766x8k0k7jpqimpwnk";
clang-tools-extra_src = fetch "clang-tools-extra" "16bwckgcxfn56mbqjlxi7fxja0zm9hjfa6s3ncm3dz98n5zd7ds1"; clang-tools-extra_src = fetch "clang-tools-extra" "16bwckgcxfn56mbqjlxi7fxja0zm9hjfa6s3ncm3dz98n5zd7ds1";
self = { # Add man output without introducing extra dependencies.
llvm = callPackage ./llvm.nix { overrideManOutput = drv:
inherit compiler-rt_src stdenv; let drv-manpages = drv.override { enableManpages = true; }; in
}; drv // { man = drv-manpages.man; outputs = drv.outputs ++ ["man"]; };
clang-unwrapped = callPackage ./clang { llvm = callPackage ./llvm.nix {
inherit clang-tools-extra_src stdenv; inherit compiler-rt_src stdenv;
}; };
clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src stdenv;
};
self = {
llvm = overrideManOutput llvm;
clang-unwrapped = overrideManOutput clang-unwrapped;
llvm-manpages = lowPrio self.llvm.man;
clang-manpages = lowPrio self.clang-unwrapped.man;
clang = wrapCC self.clang-unwrapped; clang = wrapCC self.clang-unwrapped;

2
pkgs/development/compilers/llvm/4/llvm.nix
View File

@ -16,7 +16,7 @@
, compiler-rt_src , compiler-rt_src
, libcxxabi , libcxxabi
, debugVersion ? false , debugVersion ? false
, enableManpages ? true , enableManpages ? false
, enableSharedLibraries ? true , enableSharedLibraries ? true
, darwin , darwin
}: }:

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

@ -235,11 +235,11 @@ in rec {
libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep
coreutils findutils diffutils patchutils; coreutils findutils diffutils patchutils;
llvmPackages = let llvmOverride = llvmPackages.llvm.override { enableManpages = false; inherit libcxxabi; }; in llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; };
super.llvmPackages // { in super.llvmPackages // {
llvm = llvmOverride; llvm = llvmOverride;
clang-unwrapped = llvmPackages.clang-unwrapped.override { enableManpages = false; llvm = llvmOverride; }; clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; };
}; };
darwin = super.darwin // { darwin = super.darwin // {
inherit (darwin) dyld Libsystem libiconv locale; inherit (darwin) dyld Libsystem libiconv locale;