aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorTaylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>2015-11-03 16:22:56 +0100
committerTaylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>2015-11-03 16:25:46 +0100
commit9ff7827a21c13e67fb72196da10ab1ad30d79ddf (patch)
treeb07961c1fcb0947961cb664cf1bd09b114b46e7b /gnu/packages
parentc869eed1a7034d1930343e70950c50a5a2814963 (diff)
downloadgnu-guix-9ff7827a21c13e67fb72196da10ab1ad30d79ddf.tar
gnu-guix-9ff7827a21c13e67fb72196da10ab1ad30d79ddf.tar.gz
gnu: nestopia-ue: Use system zlib.
* gnu/packages/games.scm (nestopia-ue): Remove bundled zlib, patch files to include system zlib.h, and add zlib as input.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/games.scm12
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9c57a88dee..f522db3073 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1228,9 +1228,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
(base32
"07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"))
(modules '((guix build utils)))
- ;; We don't need libretro for the GNU/Linux build.
(snippet
- '(delete-file-recursively "libretro"))))
+ '(begin
+ ;; We don't need libretro for the GNU/Linux build.
+ (delete-file-recursively "libretro")
+ ;; Use system zlib.
+ (delete-file-recursively "source/zlib")
+ (substitute* "source/core/NstZlib.cpp"
+ (("#include \"../zlib/zlib.h\"") "#include <zlib.h>"))))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -1240,7 +1245,8 @@ world}, @uref{http://evolonline.org, Evol Online} and
("gtk+" ,gtk+)
("libarchive" ,libarchive)
("mesa" ,mesa)
- ("sdl2" ,sdl2)))
+ ("sdl2" ,sdl2)
+ ("zlib" ,zlib)))
(arguments
'(#:phases
(modify-phases %standard-phases