01/01: gnu: ncurses: Fix cross-compilation.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 11b9a22366a8a0bd8f9ccdb95873085899c175ed
Author: Ludovic Courtès <address@hidden>
Date:   Mon Dec 18 10:04:57 2017 +0100

    gnu: ncurses: Fix cross-compilation.
    
    This fixes a regression introduced in
    667082d59104d4b964dce878f5e8c0f8ad1be958 whereby cross-compiling ncurses
    would fail.
    
    * gnu/packages/ncurses.scm (ncurses)[arguments]: In CONFIGURE-PHASE, get
    "rollup-patch" from NATIVE-INPUTS when cross-compiling.
---
 gnu/packages/ncurses.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index 524252d..dcf7bee 100644
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014, 2016 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015, 2017 Leo Famulari <address@hidden>
 ;;; Copyright © 2016 ng0 <address@hidden>
@@ -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")))))