From ebb2ca7574e20df9f124846583258759652c2719 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 4 Dec 2017 05:42:17 +0000
Subject: otfcc: build with ninja

Makefiles generated by premake do not support parallel building:

cd build/gmake
make -f deps.make config=release_x64 obj/x64/release/deps/sds.o
sds.c
../../dep/extern/sds.c:1088:1: fatal error: opening dependency file obj/x64/release/deps/sds.d: No such file or directory
 }
 ^
compilation terminated.
make: *** [deps.make:194: obj/x64/release/deps/sds.o] Error 1
---
 pkgs/tools/misc/otfcc/default.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'pkgs/tools/misc/otfcc')

diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix
index f55f4e53296..8e2ecdcd6bb 100644
--- a/pkgs/tools/misc/otfcc/default.nix
+++ b/pkgs/tools/misc/otfcc/default.nix
@@ -1,25 +1,24 @@
-{ stdenv, fetchurl, premake5, hostPlatform }:
+{ stdenv, fetchFromGitHub, premake5, ninja, hostPlatform }:
 
 stdenv.mkDerivation rec {
   name = "otfcc-${version}";
   version = "0.8.6";
 
-  src = fetchurl {
-    url = "https://github.com/caryll/otfcc/archive/v${version}.tar.gz";
-    sha256 = "0kap52bzrn21fmph8j2pc71f80f38ak1p2fcczzmrh0hb1r9c8dd";
+  src = fetchFromGitHub {
+    owner = "caryll";
+    repo = "otfcc";
+    rev = "v${version}";
+    sha256 = "0yy9awffxxs0cdlf0akld73ndnwmylxvplac4k6j7641m3vk1g8p";
   };
 
-  nativeBuildInputs = [ premake5 ];
+  nativeBuildInputs = [ premake5 ninja ];
 
   configurePhase = ''
-    premake5 gmake
+    premake5 ninja
   '';
 
-  preBuild = "cd build/gmake";
-
-  makeFlags = ''config=release_${if hostPlatform.isi686 then "x86" else "x64"}'';
-
-  postBuild = "cd ../..";
+  ninjaFlags = let x = if hostPlatform.isi686 then "x86" else "x64"; in
+    [ "-C" "build/ninja" "otfccdump_release_${x}" "otfccbuild_release_${x}" ];
 
   installPhase = ''
     mkdir -p $out/bin
-- 
cgit 1.4.1