diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-06-01 23:23:56 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-06-01 23:23:56 +0200 |
| commit | 9e2aba35728de7012a0692f75a3f24685f0fc28b (patch) | |
| tree | 87b1376f69d2f3070a57f500c1ec3a3e52139f95 /pkgs/development | |
| parent | b3fb9178e8ade242543d99ea91b623270a7ccf8a (diff) | |
| download | nixlib-9e2aba35728de7012a0692f75a3f24685f0fc28b.tar nixlib-9e2aba35728de7012a0692f75a3f24685f0fc28b.tar.gz nixlib-9e2aba35728de7012a0692f75a3f24685f0fc28b.tar.bz2 nixlib-9e2aba35728de7012a0692f75a3f24685f0fc28b.tar.lz nixlib-9e2aba35728de7012a0692f75a3f24685f0fc28b.tar.xz nixlib-9e2aba35728de7012a0692f75a3f24685f0fc28b.tar.zst nixlib-9e2aba35728de7012a0692f75a3f24685f0fc28b.zip | |
darwin-stdenv: remove python-sphinx and a bunch of other dependencies from the stdenv
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/llvm/4/clang/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/4/llvm.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 2 |
3 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 004893873f56..64dbaa21dd42 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -37,7 +37,7 @@ let patches = [ ./purity.patch ]; - postBuild = '' + postBuild = stdenv.lib.optionalString enableManpages '' cmake --build . --target docs-clang-man ''; @@ -49,7 +49,8 @@ let sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt ''; - outputs = [ "out" ] ++ stdenv.lib.optional enableManpages "man" ++ [ "python" ]; + outputs = [ "out" "python" ] + ++ stdenv.lib.optional enableManpages "man"; # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix @@ -68,7 +69,6 @@ let rm $out/bin/c-index-test '' + stdenv.lib.optionalString enableManpages '' - # Manually install clang manpage cp docs/man/*.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 7d55bc5b4105..98c24495355c 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -40,8 +40,8 @@ in stdenv.mkDerivation rec { ''; outputs = [ "out" ] - ++ stdenv.lib.optional enableManpages "man" - ++ stdenv.lib.optional enableSharedLibraries "lib"; + ++ stdenv.lib.optional enableSharedLibraries "lib" + ++ stdenv.lib.optional enableManpages "man"; nativeBuildInputs = [ perl groff cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; @@ -86,17 +86,19 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code - ] ++ stdenv.lib.optionals enableManpages [ + ] + ++ stdenv.lib.optional enableSharedLibraries + "-DLLVM_LINK_LLVM_DYLIB=ON" + ++ stdenv.lib.optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ stdenv.lib.optional enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ] ++ stdenv.lib.optional (!isDarwin) + ] + ++ stdenv.lib.optional (!isDarwin) "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" - ++ stdenv.lib.optionals (isDarwin) [ + ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ]; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 00d76fbff9fe..d0a346038352 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -3,7 +3,7 @@ # darwin attributes , ps , isBootstrap ? false -, useSharedLibraries ? !stdenv.isCygwin +, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useNcurses ? false, ncurses , useQt4 ? false, qt4 }: |