public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77610 from LnL7/darwin-stdenv-python3

Browse Source 
darwin-stdenv: bootstrap with python3
This commit is contained in:
Frederik Rietdijk
2020-01-15 09:24:57 +01:00
committed by GitHub
parent 2a88c3c302 c05efedd4d
commit bc18cc72dd
48 changed files with 181 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/build-managers/ninja/default.nix
View File

@@ -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