aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-04-02 22:24:43 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-02 22:25:55 +0200
commit9c4b6e5484b8a33d666029444af854989ae67803 (patch)
treefde8faaf202fd120a9026dc2298ae53f2599b831
parent7e3c9f741b8a5ee3551be6ba5fe1721b4fb30e8a (diff)
downloadguix-9c4b6e5484b8a33d666029444af854989ae67803.tar
guix-9c4b6e5484b8a33d666029444af854989ae67803.tar.gz
gnu: ncurses: Install terminfo files when cross-compiling.
* gnu/packages/ncurses.scm (ncurses): Remove 'cross-pre-install-phase'. When cross-compiling, it was leading to an empty $out/share/terminfo directory.
-rw-r--r--gnu/packages/ncurses.scm17
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