diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-04-17 22:06:05 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 22:06:05 -0400 |
| commit | 334345d9db53326fa062298e2372d6c33123949a (patch) | |
| tree | 50774c171f1a348bd7de8e9a447bad2a14a9dffb /gnu/packages/ncurses.scm | |
| parent | 8d7dc5d9dbf009009d33e21598f92c4685965cd5 (diff) | |
| parent | 09dd019490e4a269b0a2d9512a07688f8ee657d3 (diff) | |
| download | guix-334345d9db53326fa062298e2372d6c33123949a.tar guix-334345d9db53326fa062298e2372d6c33123949a.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/ncurses.scm')
| -rw-r--r-- | gnu/packages/ncurses.scm | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 0dbc583f79..180cdde19f 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -43,14 +43,6 @@ (string-append "CONFIG_SHELL=" bash) (string-append "--prefix=" out) configure-flags))))) - (cross-pre-install-phase - '(lambda _ - ;; Run the native `tic' program, not the cross-built one. - (substitute* "misc/run_tic.sh" - (("\\{TIC_PATH:=.*\\}") - "{TIC_PATH:=true}") - (("cross_compiling:=no") - "cross_compiling:=yes")))) (post-install-phase '(lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -116,12 +108,9 @@ `(alist-cons-before ; cross build 'configure 'patch-makefile-SHELL ,patch-makefile-phase - (alist-cons-before - 'install 'pre-install - ,cross-pre-install-phase - (alist-cons-after - 'install 'post-install ,post-install-phase - %standard-phases))) + (alist-cons-after + 'install 'post-install ,post-install-phase + %standard-phases)) `(alist-cons-after ; native build 'install 'post-install ,post-install-phase |