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

Revert "gnu: texinfo: Fix cross-compilation." 

This causes too many rebuilds for the master branch.

This reverts commit 210b6412ee.
This commit is contained in:
Marius Bakke 2019-09-04 19:18:10 +02:00
parent 7c93edb93e
commit 4ab97ef18f
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/texinfo.scm
View File

@ -42,28 +42,8 @@
(base32 (base32
"0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp")))) "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (inputs `(("ncurses" ,ncurses)
;; When cross-compiling, the package is configured twice: once with the ("perl" ,perl)))
;; native compiler and once with the cross-compiler. During the configure
;; with the native compiler, the environment is reset. This leads to
;; multiple environment variables missing. Do not reset the environment
;; to prevent that.
(if (%current-target-system)
'(#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-cross-configure
(lambda _
(substitute* "configure"
(("env -i")
"env "))
#t))))
'()))
(inputs `(("ncurses" ,ncurses)))
;; When cross-compiling, texinfo will build some of its own binaries with
;; the native compiler. This means ncurses is needed both in both inputs
;; and native-inputs.
(native-inputs `(("perl" ,perl)
("ncurses" ,ncurses)))
(native-search-paths (native-search-paths
;; This is the variable used by the standalone Info reader. ;; This is the variable used by the standalone Info reader.