[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: gnu: odamex: Unbundle some libraries.
From: |
guix-commits |
Subject: |
05/08: gnu: odamex: Unbundle some libraries. |
Date: |
Sat, 10 Feb 2024 10:50:28 -0500 (EST) |
sharlatan pushed a commit to branch master
in repository guix.
commit 54592df80d915a1841908daaa269fc0c82bf6926
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Sat Feb 10 14:39:59 2024 +0000
gnu: odamex: Unbundle some libraries.
* gnu/packages/games.scm (odamex) [snippet]: Remove some bundled
libraries which may be replaced by inputs.
[arguments] <#:configure-flags>: Add options to build client, master and
server. Do not use internal libs explicitly.
[native-inputs]: Add pkg-config.
Change-Id: I1974febb2f5f37d963ecb5b663d17a330ba23129
---
gnu/packages/games.scm | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 260fd08cfc..95f55a7e48 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8104,11 +8104,29 @@ Strife, Chex Quest, and fan-created games like Harmony,
Hacx and Freedoom.")
"mirror://sourceforge/odamex/Odamex/" version "/"
"odamex-src-" version ".tar.xz"))
(sha256
- (base32 "1isrmki18471yry48mmm7lxzp1kiqma9cc7fx38cvpm2mpgfyvzk"))))
+ (base32 "1isrmki18471yry48mmm7lxzp1kiqma9cc7fx38cvpm2mpgfyvzk"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; XXX: Unbundle more, they are not replaced by the ones provided
+ ;; in inputs: fltk, jsoncpp, miniupnp, protobuf.
+ ;;
+ ;; Remove some bundled libraries.
+ (with-directory-excursion "libraries"
+ (for-each delete-file-recursively
+ '("curl" "libpng" "portmidi" "zlib")))))))
(build-system cmake-build-system)
- (arguments `(#:tests? #f)) ; no tests
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:configure-flags
+ #~(list "-DBUILD_CLIENT=1"
+ "-DBUILD_MASTER=1"
+ "-DBUILD_SERVER=1"
+ "-DUSE_INTERNAL_LIBS=0"
+ "-DUSE_INTERNAL_MINIUPNP=0")))
(native-inputs
- (list deutex))
+ (list deutex pkg-config))
(inputs
`(("alsa-lib" ,alsa-lib)
("curl" ,curl)
- branch master updated (caa7a95157 -> 121bf9b296), guix-commits, 2024/02/10
- 04/08: gnu: odamex: Update to 10.4.0., guix-commits, 2024/02/10
- 06/08: gnu: odamex: Remove package labels., guix-commits, 2024/02/10
- 01/08: gnu: sssd: Update to 2.9.4., guix-commits, 2024/02/10
- 07/08: gnu: lldb: Update to 17.0.6., guix-commits, 2024/02/10
- 05/08: gnu: odamex: Unbundle some libraries.,
guix-commits <=
- 08/08: gnu: fcft: Enable shaping support., guix-commits, 2024/02/10
- 02/08: gnu: ocrad: Update to 0.29, guix-commits, 2024/02/10
- 03/08: gnu: sameboy: Update to 0.16.2., guix-commits, 2024/02/10