nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: minetest: Fix build with modified cmake build system. 

* gnu/packages/games.scm (minetest)[arguments]: Instead of setting CPATH,
  which is no more used by the cmake build system since commit 0d6f936, set
  the include directories for irrlicht and curl directly via configure flags.
This commit is contained in:
Andreas Enge 2015-03-14 18:22:25 +01:00
parent c12efc72cf
commit 109033563f
1 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnu/packages/games.scm
View File

@ -624,27 +624,16 @@ for common mesh file formats, and collision detection.")
"0h223svzkvp63b77nqfxy7k8whw4543gahs3kxd3x4myi5ax5z5f")))) "0h223svzkvp63b77nqfxy7k8whw4543gahs3kxd3x4myi5ax5z5f"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:configure-flags
(guix build cmake-build-system) (list "-DRUN_IN_PLACE=0"
(ice-9 match))
#:phases (alist-cons-before
'configure 'set-cpath
(lambda* (#:key inputs #:allow-other-keys)
(use-modules (ice-9 match))
;; Adjust the CPATH so that cmake can find irrlicht,
;; openal, and curl headers.
(set-path-environment-variable "CPATH"
'("include/AL"
"include/irrlicht"
"include/curl"
"include")
(map (match-lambda
((_ . dir) dir))
inputs)))
%standard-phases)
#:configure-flags '("-DRUN_IN_PLACE=0"
"-DENABLE_FREETYPE=1" "-DENABLE_FREETYPE=1"
"-DENABLE_GETTEXT=1") "-DENABLE_GETTEXT=1"
(string-append "-DIRRLICHT_INCLUDE_DIR="
(assoc-ref %build-inputs "irrlicht")
"/include/irrlicht")
(string-append "-DCURL_INCLUDE_DIR="
(assoc-ref %build-inputs "curl")
"/include/curl"))
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification