gnu: cmake: Fix cross-compilation.
* gnu/packages/cmake.scm (cmake-minimal)[inputs]: Move all inputs to ... [native-inputs]: ... here, except for ncurses.
This commit is contained in:
		
							parent
							
								
									3403a42010
								
							
						
					
					
						commit
						a8446b4029
					
				
					 1 changed files with 4 additions and 2 deletions
				
			
		| 
						 | 
					@ -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")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue