me/guix
Archived
1
0
Fork 0
Code Activity

gnu: cmake: Fix cross-compilation.

Browse source 
* 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.
This commit is contained in:
Marius Bakke 2020-01-26 13:15:55 +01:00
parent a51c9c903f
commit ac841750a5
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/cmake.scm
View file

@ -197,17 +197,17 @@
(lambda* (#:key (configure-flags '()) #:allow-other-keys) (lambda* (#:key (configure-flags '()) #:allow-other-keys)
(apply invoke "./configure" configure-flags)))))) (apply invoke "./configure" configure-flags))))))
(native-inputs (native-inputs
`(("libarchive:source" ,(package-source libarchive))))
(inputs
`(("bzip2" ,bzip2) `(("bzip2" ,bzip2)
("curl" ,curl-minimal) ("curl" ,curl-minimal)
("expat" ,expat) ("expat" ,expat)
("file" ,file) ("file" ,file)
("libarchive" ,libarchive) ("libarchive" ,libarchive)
("libarchive:source" ,(package-source 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")
@ -252,10 +252,10 @@ and workspaces that can be used in the compiler environment of your choice.")
'("Utilities/cmjsoncpp" '("Utilities/cmjsoncpp"
"Utilities/cmlibuv"))) "Utilities/cmlibuv")))
exp)))))) exp))))))
(native-inputs (inputs
`(("curl" ,curl) `(("curl" ,curl)
("jsoncpp" ,jsoncpp) ("jsoncpp" ,jsoncpp)
,@(alist-delete "curl" (package-native-inputs cmake-bootstrap)))) ,@(alist-delete "curl" (package-inputs cmake-bootstrap))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags