[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: ntk: Don't use bundled waf.
From: |
guix-commits |
Subject: |
02/02: gnu: ntk: Don't use bundled waf. |
Date: |
Wed, 21 Nov 2018 08:43:38 -0500 (EST) |
efraim pushed a commit to branch core-updates
in repository guix.
commit 4cf879fefbce0a4e960f8c90e1f8b598d7a6e3df
Author: Efraim Flashner <address@hidden>
Date: Wed Nov 21 15:38:52 2018 +0200
gnu: ntk: Don't use bundled waf.
* gnu/packages/fltk.scm (ntk)[inputs]: Add python-waf.
[arguments]: Add custom phase to replace vendored waf.
---
gnu/packages/fltk.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm
index a3c088c..972506c 100644
--- a/gnu/packages/fltk.scm
+++ b/gnu/packages/fltk.scm
@@ -115,6 +115,12 @@ UI builder called FLUID that can be used to create
applications in minutes.")
#:configure-flags '("--enable-gl")
#:phases
(modify-phases %standard-phases
+ (add-before 'configure 'setup-waf
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((waf (assoc-ref inputs "waf")))
+ (delete-file "waf")
+ (copy-file (string-append waf "/bin/waf") "waf"))
+ #t))
(add-before 'configure 'set-ldflags
(lambda* (#:key outputs #:allow-other-keys)
(setenv "LDFLAGS"
@@ -123,7 +129,8 @@ UI builder called FLUID that can be used to create
applications in minutes.")
#t)))))
(inputs
`(("libjpeg" ,libjpeg)
- ("glu" ,glu)))
+ ("glu" ,glu)
+ ("waf" ,python-waf)))
;; ntk.pc lists "x11" and "xft" in Requires.private, and "cairo" in
;; Requires.
(propagated-inputs