[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: nestopia-ue: Use system zlib.
From: |
Taylan Ulrich Bay?rl?/Kammer |
Subject: |
01/01: gnu: nestopia-ue: Use system zlib. |
Date: |
Tue, 03 Nov 2015 15:26:05 +0000 |
taylanub pushed a commit to branch master
in repository guix.
commit 9ff7827a21c13e67fb72196da10ab1ad30d79ddf
Author: Taylan Ulrich Bayırlı/Kammer <address@hidden>
Date: Tue Nov 3 16:22:56 2015 +0100
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.
---
gnu/packages/games.scm | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9c57a88..f522db3 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