From ac841750a52e44d68d7f1b02e9507421f3e3824f Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sun, 26 Jan 2020 13:15:55 +0100
Subject: gnu: cmake: Fix cross-compilation.

* gnu/packages/cmake.scm (cmake-bootstrap)[native-inputs]: Move everything
except (PACKAGE-SOURCE LIBARCHIVE) ...
[inputs]: ... here.
* gnu/packages/cmake.scm (cmake-minimal)[native-inputs, inputs]: Adjust accordingly.
---
 gnu/packages/cmake.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/cmake.scm')

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 93a71e1d92..cc4340bbc6 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -197,17 +197,17 @@ (define-public cmake-bootstrap
            (lambda* (#:key (configure-flags '()) #:allow-other-keys)
              (apply invoke "./configure" configure-flags))))))
     (native-inputs
+     `(("libarchive:source" ,(package-source libarchive))))
+    (inputs
      `(("bzip2" ,bzip2)
        ("curl" ,curl-minimal)
        ("expat" ,expat)
        ("file" ,file)
        ("libarchive" ,libarchive)
-       ("libarchive:source" ,(package-source libarchive))
        ("libuv" ,libuv)
+       ("ncurses" ,ncurses)             ;required for ccmake
        ("rhash" ,rhash)
        ("zlib" ,zlib)))
-    (inputs
-     `(("ncurses" ,ncurses))) ; required for ccmake
     (native-search-paths
      (list (search-path-specification
             (variable "CMAKE_PREFIX_PATH")
@@ -252,10 +252,10 @@ (define-public cmake-minimal
                                        '("Utilities/cmjsoncpp"
                                          "Utilities/cmlibuv")))
                           exp))))))
-    (native-inputs
+    (inputs
      `(("curl" ,curl)
        ("jsoncpp" ,jsoncpp)
-       ,@(alist-delete "curl" (package-native-inputs cmake-bootstrap))))
+       ,@(alist-delete "curl" (package-inputs cmake-bootstrap))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit v1.2.3