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

gnu: ncurses: Fix cross-compilation. 

This fixes a regression introduced in
667082d591 whereby cross-compiling ncurses
would fail.

* gnu/packages/ncurses.scm (ncurses)[arguments]: In CONFIGURE-PHASE, get
"rollup-patch" from NATIVE-INPUTS when cross-compiling.
This commit is contained in:
Ludovic Courtès 2017-12-18 10:04:57 +01:00
parent 01564e5ab5
commit 11b9a22366
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/ncurses.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
@ -73,8 +73,8 @@
configure-flags)
configure-flags))))))
(apply-rollup-patch-phase
'(lambda* (#:key inputs #:allow-other-keys)
(copy-file (assoc-ref inputs "rollup-patch")
'(lambda* (#:key inputs native-inputs #:allow-other-keys)
(copy-file (assoc-ref (or native-inputs inputs) "rollup-patch")
(string-append (getcwd) "/rollup-patch.sh.bz2"))
(and (zero? (system* "bzip2" "-d" "rollup-patch.sh.bz2"))
(zero? (system* "sh" "rollup-patch.sh")))))