nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2015-04-02 22:24:43 +02:00
parent 7e3c9f741b
commit 9c4b6e5484
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/ncurses.scm
View File

@ -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