From 9792c039ee5ee3a09c2701a49ad00cce1f09bc8a Mon Sep 17 00:00:00 2001
From: Roberto Di Remigio <roberto.diremigio@gmail.com>
Date: Sat, 18 Nov 2017 17:55:01 +0100
Subject: [PATCH] ninja: 1.7.2 -> 1.8.2

---
 .../tools/build-managers/ninja/default.nix    | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index fff6af396b9f..c59d2faaf26c 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -1,29 +1,28 @@
-{ stdenv, fetchurl, python, asciidoc, re2c }:
+{ stdenv, fetchFromGitHub, python, asciidoc, re2c }:
 
 stdenv.mkDerivation rec {
   name = "ninja-${version}";
-  version = "1.7.2";
+  version = "1.8.2";
 
-  src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://github.com/ninja-build/ninja/archive/v${version}.tar.gz";
-    sha256 = "1n8n3g26ppwh7zwrc37n3alkbpbj0wki34ih53s3rkhs8ajs1p9f";
+  src = fetchFromGitHub {
+    owner = "ninja-build";
+    repo = "ninja";
+    rev = "v${version}";
+    sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f";
   };
 
-  buildInputs = [ python asciidoc re2c ];
+  nativeBuildInputs = [ python asciidoc re2c ];
 
   buildPhase = ''
-    python bootstrap.py
+    python configure.py --bootstrap
     asciidoc doc/manual.asciidoc
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp ninja $out/bin/
-
-    mkdir -p $out/share/doc/ninja
-    cp doc/manual.asciidoc $out/share/doc/ninja/
-    cp doc/manual.html $out/share/doc/ninja/
+    install -Dm555 -t $out/bin ninja
+    install -Dm444 -t $out/share/doc/ninja doc/manual.asciidoc doc/manual.html
+    install -Dm444 misc/bash-completion $out/share/bash-completion/completions/ninja
+    install -Dm444 misc/zsh-completion $out/share/zsh/site-functions/_ninja
   '';
 
   setupHook = ./setup-hook.sh;
@@ -36,9 +35,9 @@ stdenv.mkDerivation rec {
       input files generated by a higher-level build system, and it is designed
       to run builds as fast as possible.
     '';
-    homepage = http://martine.github.io/ninja/;
+    homepage = https://ninja-build.org/;
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = [ maintainers.thoughtpolice maintainers.bjornfor ];
+    maintainers = with maintainers; [ thoughtpolice bjornfor orivej ];
   };
 }