Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 32a7d27aad38
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 173d12a4ca5e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 12, 2019

  1. ninja: patch to fix w/musl, see upstream issue

    @dtzWill
    dtzWill committed Feb 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ncfavier Naïm Camille Favier
    GPG key ID: 49B07322580B7EE2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0f14c9c View commit details

  2. Merge pull request #55619 from dtzWill/update/ninja-1.9.0-fix-musl 

    ninja: patch to fix w/musl, see upstream issue
    @dtzWill
    dtzWill authored Feb 12, 2019
    Copy the full SHA
    173d12a View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 pkgs/development/tools/build-managers/ninja/default.nix
7 changes: 7 additions & 0 deletions pkgs/development/tools/build-managers/ninja/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch";
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;
sha256 = "0zd0xyi7h2066nw1dsk76c7yf71b0f7v4p5nljda7jxi01vpdh69";
})
];

nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ];