me
/
guix
Archived
1
0
Fork 0
Code

gnu: cmake: Fix cross-compilation. 

* gnu/packages/cmake.scm (cmake-minimal)[inputs]: Move all inputs to ...
[native-inputs]: ... here, except for ncurses.
master
Pierre-Moana Levesque 2019-08-05 22:50:54 +02:00 committed by Mathieu Othacehe
parent 3403a42010
commit a8446b4029
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/cmake.scm
View File

@ -9,6 +9,7 @@
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -145,16 +146,17 @@
(replace 'configure (replace 'configure
(lambda* (#:key (configure-flags '()) #:allow-other-keys) (lambda* (#:key (configure-flags '()) #:allow-other-keys)
(apply invoke "./configure" configure-flags)))))) (apply invoke "./configure" configure-flags))))))
(inputs (native-inputs
`(("bzip2" ,bzip2) `(("bzip2" ,bzip2)
("curl" ,curl) ("curl" ,curl)
("expat" ,expat) ("expat" ,expat)
("file" ,file) ("file" ,file)
("libarchive" ,libarchive) ("libarchive" ,libarchive)
("libuv" ,libuv) ("libuv" ,libuv)
("ncurses" ,ncurses) ; required for ccmake
("rhash" ,rhash) ("rhash" ,rhash)
("zlib" ,zlib))) ("zlib" ,zlib)))
(inputs
`(("ncurses" ,ncurses))) ; required for ccmake
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "CMAKE_PREFIX_PATH") (variable "CMAKE_PREFIX_PATH")