[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: gnu: qt: Use our ninja.
From: |
??? |
Subject: |
03/03: gnu: qt: Use our ninja. |
Date: |
Fri, 09 Jan 2015 13:56:42 +0000 |
iyzsong pushed a commit to branch wip-qt
in repository guix.
commit 1d2893cc9eff759ec4c7690db03b826475e946e2
Author: 宋文武 <address@hidden>
Date: Fri Jan 9 21:52:59 2015 +0800
gnu: qt: Use our ninja.
* gnu/packages/qt.scm (qt)[native-inputs]: Add ninja.
[arguments]: Set NINJA_PATH in configure phase.
---
gnu/packages/qt.scm | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6ff9c32..60f530c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -35,6 +35,7 @@
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
#:use-module (gnu packages databases)
+ #:use-module (gnu packages ninja)
#:use-module (gnu packages openssl)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages pcre)
@@ -151,6 +152,7 @@ webrtc/tools/e2e_quality/audio/perf")))))
`(("bison" ,bison)
("flex" ,flex)
("gperf" ,gperf)
+ ("ninja" ,ninja)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-2)
@@ -168,6 +170,7 @@ webrtc/tools/e2e_quality/audio/perf")))))
(("/bin/ls") (which "ls")))
(substitute*
"qtwebengine/src/3rdparty/chromium/build/common.gypi"
(("/bin/echo") (which "echo")))
+ (setenv "NINJA_PATH" (which "ninja"))
;; do not pass "--enable-fast-install", which makes the
;; configure process fail
(zero? (system*