diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-23 12:40:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-23 12:40:13 +0000 |
commit | 58752914f4b22a570ff7cba694df86aef20e255a (patch) | |
tree | 13ed5492ea1c875253d18c4bcb981f9effe11ee2 /pkgs/development/compilers/llvm/6/clang/default.nix | |
parent | f6c56619d7aa645772bf160c048b36d2269508c6 (diff) | |
parent | 10a27d6d5296619de1a05538cd1d5b81b612b225 (diff) | |
download | nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.gz nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.bz2 nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.lz nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.xz nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.zst nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/llvm/6/clang/default.nix')
-rw-r--r-- | pkgs/development/compilers/llvm/6/clang/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 63a79ffba8a..41202dd3f5d 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false }: @@ -19,15 +19,15 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" @@ -44,7 +44,7 @@ let # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -80,10 +80,10 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = "https://llvm.org/"; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; }; - } // stdenv.lib.optionalAttrs enableManpages { + } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; buildPhase = '' |