diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-01-15 09:24:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 09:24:57 +0100 |
| commit | bc18cc72dd6a07914f55146504b0f6d6c82154eb (patch) | |
| tree | e6483a691a2fdf9b5a63791b6db0ef78ed909368 /pkgs/development/tools/build-managers | |
| parent | 2a88c3c30291206f61b2d235aca4df213b50ca38 (diff) | |
| parent | c05efedd4d23ec58fdc4b884ae25079959142f69 (diff) | |
| download | nixlib-bc18cc72dd6a07914f55146504b0f6d6c82154eb.tar nixlib-bc18cc72dd6a07914f55146504b0f6d6c82154eb.tar.gz nixlib-bc18cc72dd6a07914f55146504b0f6d6c82154eb.tar.bz2 nixlib-bc18cc72dd6a07914f55146504b0f6d6c82154eb.tar.lz nixlib-bc18cc72dd6a07914f55146504b0f6d6c82154eb.tar.xz nixlib-bc18cc72dd6a07914f55146504b0f6d6c82154eb.tar.zst nixlib-bc18cc72dd6a07914f55146504b0f6d6c82154eb.zip | |
Merge pull request #77610 from LnL7/darwin-stdenv-python3
darwin-stdenv: bootstrap with python3
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/ninja/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 1c90bcc3a9f8..7001510d52d6 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: +{ stdenv, fetchFromGitHub, fetchpatch, python3, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: with stdenv.lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9"; }) # https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs? - # + # (fetchpatch { name = "fix-issue-1510.patch"; url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; + nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; buildPhase = '' python configure.py --bootstrap |