diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2018-11-21 15:38:52 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2018-11-21 15:43:23 +0200 |
commit | 4cf879fefbce0a4e960f8c90e1f8b598d7a6e3df (patch) | |
tree | 1c6ed3e3c834ee051529f2694bf185b190f39114 | |
parent | 24a2e19c432580a1a4900417ce81a4826e41e8f4 (diff) | |
download | guix-4cf879fefbce0a4e960f8c90e1f8b598d7a6e3df.tar.gz guix-4cf879fefbce0a4e960f8c90e1f8b598d7a6e3df.zip |
gnu: ntk: Don't use bundled waf.
* gnu/packages/fltk.scm (ntk)[inputs]: Add python-waf.
[arguments]: Add custom phase to replace vendored waf.
-rw-r--r-- | gnu/packages/fltk.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index a3c088c2e8..972506c8c5 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 |