[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/22: gnu: cmake: Fix cross-compilation.
From: |
guix-commits |
Subject: |
17/22: gnu: cmake: Fix cross-compilation. |
Date: |
Fri, 15 Nov 2019 11:32:46 -0500 (EST) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit a8446b40295c18ce1fcce66081c828bb391c09c9
Author: Pierre-Moana Levesque <address@hidden>
Date: Mon Aug 5 22:50:54 2019 +0200
gnu: cmake: Fix cross-compilation.
* gnu/packages/cmake.scm (cmake-minimal)[inputs]: Move all inputs to ...
[native-inputs]: ... here, except for ncurses.
---
gnu/packages/cmake.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 13252a9..b9ac84a 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2018 Arun Isaac <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2019 Maxim Cournoyer <address@hidden>
+;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -145,16 +146,17 @@
(replace 'configure
(lambda* (#:key (configure-flags '()) #:allow-other-keys)
(apply invoke "./configure" configure-flags))))))
- (inputs
+ (native-inputs
`(("bzip2" ,bzip2)
("curl" ,curl)
("expat" ,expat)
("file" ,file)
("libarchive" ,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")
- branch core-updates updated (2387e2f -> e4696c6), guix-commits, 2019/11/15
- 01/22: gnu: openssl: Fix cross-compilation., guix-commits, 2019/11/15
- 02/22: gnu: cmake: Fix cross-compilation., guix-commits, 2019/11/15
- 05/22: gnu: icu4c: Fix cross-compilation., guix-commits, 2019/11/15
- 10/22: gnu: swig: Fix cross-compilation., guix-commits, 2019/11/15
- 11/22: gnu: git: Fix cross-compilation., guix-commits, 2019/11/15
- 04/22: gnu: cyrus-sasl: Fix cross-compilation., guix-commits, 2019/11/15
- 17/22: gnu: cmake: Fix cross-compilation.,
guix-commits <=
- 13/22: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/11/15
- 12/22: gnu: doxygen: Fix cross-compilation., guix-commits, 2019/11/15
- 08/22: gnu: bdb: Fix cross-compilation., guix-commits, 2019/11/15
- 07/22: gnu: eudev: Fix cross-compilation., guix-commits, 2019/11/15
- 18/22: utils: Use target-aarch64? and target-arm? helpers., guix-commits, 2019/11/15
- 15/22: gnu: libnl: Move python outputs to separate packages., guix-commits, 2019/11/15
- 09/22: gnu: openldap: Fix cross-compilation., guix-commits, 2019/11/15
- 19/22: build: vm: Fix arm32 support., guix-commits, 2019/11/15
- 21/22: system: vm: Support cross-compilation., guix-commits, 2019/11/15
- 20/22: system: vm: Add arm64 support., guix-commits, 2019/11/15