diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-06-24 13:11:43 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-06-26 20:24:16 +0200 |
| commit | f60a36a910f770bea564ba30e0dc052ab9d0d4f8 (patch) | |
| tree | b418d00e4afffd2faa7bea965c8a99d8b97ff4c3 | |
| parent | 358470763822d490fb36f8e5e3eca6f1e4c8378f (diff) | |
| download | nixpkgs-f60a36a910f770bea564ba30e0dc052ab9d0d4f8.tar nixpkgs-f60a36a910f770bea564ba30e0dc052ab9d0d4f8.tar.gz nixpkgs-f60a36a910f770bea564ba30e0dc052ab9d0d4f8.tar.bz2 nixpkgs-f60a36a910f770bea564ba30e0dc052ab9d0d4f8.tar.lz nixpkgs-f60a36a910f770bea564ba30e0dc052ab9d0d4f8.tar.xz nixpkgs-f60a36a910f770bea564ba30e0dc052ab9d0d4f8.tar.zst nixpkgs-f60a36a910f770bea564ba30e0dc052ab9d0d4f8.zip | |
llvm-packages: get rid of extra build depedencies for manpages
Fixes #26756
| -rw-r--r-- | pkgs/development/compilers/llvm/4/clang/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/4/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/4/llvm.nix | 2 |
3 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 64dbaa21dd4..276db7a7b41 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -1,6 +1,6 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames -, enableManpages ? true +, enableManpages ? false }: let diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 15918f9c1eb..703b3aeee18 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -13,14 +13,25 @@ let compiler-rt_src = fetch "compiler-rt" "059ipqq27gd928ay06f1ck3vw6y5h5z4zd766x8k0k7jpqimpwnk"; clang-tools-extra_src = fetch "clang-tools-extra" "16bwckgcxfn56mbqjlxi7fxja0zm9hjfa6s3ncm3dz98n5zd7ds1"; + # Add man output without introducing extra dependencies. + overrideManOutput = drv: + let drv-manpages = drv.override { enableManpages = true; }; in + drv // { man = drv-manpages.man; outputs = drv.outputs ++ ["man"]; }; + + llvm = callPackage ./llvm.nix { + inherit compiler-rt_src stdenv; + }; + + clang-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src stdenv; + }; + self = { - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src stdenv; - }; + llvm = overrideManOutput llvm; + clang-unwrapped = overrideManOutput clang-unwrapped; - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src stdenv; - }; + llvm-manpages = self.llvm.man; + clang-manpages = self.clang-unwrapped.man; clang = wrapCC self.clang-unwrapped; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 98c24495355..c5d22825f30 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -16,7 +16,7 @@ , compiler-rt_src , libcxxabi , debugVersion ? false -, enableManpages ? true +, enableManpages ? false , enableSharedLibraries ? true , darwin }: |