diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-07-27 21:52:50 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-07-28 00:08:26 +0200 |
commit | 3ec81ae27e257bc80a75248839c11be93adb9cc5 (patch) | |
tree | c024181a7ad9f83126b15583ca3ca1d760f916cc /pkgs/stdenv | |
parent | cacf0925a569a8958c1a5012641a43a2009319fd (diff) | |
download | nixlib-3ec81ae27e257bc80a75248839c11be93adb9cc5.tar nixlib-3ec81ae27e257bc80a75248839c11be93adb9cc5.tar.gz nixlib-3ec81ae27e257bc80a75248839c11be93adb9cc5.tar.bz2 nixlib-3ec81ae27e257bc80a75248839c11be93adb9cc5.tar.lz nixlib-3ec81ae27e257bc80a75248839c11be93adb9cc5.tar.xz nixlib-3ec81ae27e257bc80a75248839c11be93adb9cc5.tar.zst nixlib-3ec81ae27e257bc80a75248839c11be93adb9cc5.zip |
llvm-packages: fix manpages with python-boot and cleanup
On darwin llvmPackages is built using python-boot to avoid dependencies in the stdenv, but we can't and shouldn't use that when building the manpages since it depends on python packages.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b7b3640a9535..22dd700b2dda 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -339,15 +339,7 @@ in rec { llvmPackages_5 = super.llvmPackages_5 // (let 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; + inherit (llvmPackages_5) llvm clang-unwrapped; }); libraries = super.llvmPackages_5.libraries.extend (_: _: { inherit (llvmPackages_5) compiler-rt libcxx libcxxabi; @@ -384,9 +376,8 @@ in rec { initialPath = import ../common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; - # Hack to avoid man pages in stdenv, building bootstrap python cc = pkgs.llvmPackages.libcxxClang.override { - cc = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ]; + cc = pkgs.llvmPackages.clang-unwrapped; }; extraNativeBuildInputs = []; |