diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2018-01-23 10:15:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-23 10:15:25 -0500 |
| commit | 970511639b2edd1fcc69fbf1e414e7e23d6fca6a (patch) | |
| tree | 16cb92ec1647f6f176ac2d0c0db4408f9b8f39fb | |
| parent | 7bb18a9a90368179d246652602aaadb8e16841a2 (diff) | |
| parent | d18af2680d05a161907137af6480229ff619d218 (diff) | |
| download | nixlib-970511639b2edd1fcc69fbf1e414e7e23d6fca6a.tar nixlib-970511639b2edd1fcc69fbf1e414e7e23d6fca6a.tar.gz nixlib-970511639b2edd1fcc69fbf1e414e7e23d6fca6a.tar.bz2 nixlib-970511639b2edd1fcc69fbf1e414e7e23d6fca6a.tar.lz nixlib-970511639b2edd1fcc69fbf1e414e7e23d6fca6a.tar.xz nixlib-970511639b2edd1fcc69fbf1e414e7e23d6fca6a.tar.zst nixlib-970511639b2edd1fcc69fbf1e414e7e23d6fca6a.zip | |
Merge pull request #34193 from NixOS/revert-34178-fix/clang-python3
Revert "clang-{4,5}: prefer python3, much friendlier for cross"| -rw-r--r-- | pkgs/development/compilers/llvm/4/clang/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/5/clang/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 28eb118e00df..77863ab4f1ea 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python3 +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: @@ -16,8 +16,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + nativeBuildInputs = [ cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libedit libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index a0d61e7a3c9e..c8eafce4e396 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python3 +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: @@ -16,8 +16,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + nativeBuildInputs = [ cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libedit libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; |