diff options
| author | Vivien Kraus <vivien@planete-kraus.eu> | 2022-05-29 16:58:22 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2022-06-05 12:11:05 +0200 |
| commit | 3695a8d32ecbb7bf45b5adaa1f9b358467e22751 (patch) | |
| tree | c9ed74b7d64bb99482320dc07f2e2ae0be16593e /gnu/packages/minetest.scm | |
| parent | 5729e45160ffffcacc41e0e70fd9a5985657c8b7 (diff) | |
| download | guix-patches-3695a8d32ecbb7bf45b5adaa1f9b358467e22751.tar guix-patches-3695a8d32ecbb7bf45b5adaa1f9b358467e22751.tar.gz | |
gnu: minetest: Update to 5.5.1.
* gnu/local.mk (dist_patch_DATA): Remove minetest-add-MINETEST_MOD_PATH.patch.
* gnu/packages/minetest.scm (minetest): Update to 5.5.1.
[patches]: Don’t use the patch anymore.
[#:configure-flags]: Point cmake to irrlicht-for-minetest and zstd.
[inputs]: Use irrlicht-for-minetest instead of irrlicht, and add zstd.
(minetest-data): Update hash.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Diffstat (limited to 'gnu/packages/minetest.scm')
| -rw-r--r-- | gnu/packages/minetest.scm | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index c431942473..2efd1468d2 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -26,6 +26,7 @@ #:use-module (gnu packages) #:use-module (gnu packages audio) #:use-module (gnu packages base) + #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) #:use-module (gnu packages games) @@ -51,7 +52,7 @@ (define-public minetest (package (name "minetest") - (version "5.4.1") + (version "5.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -60,11 +61,8 @@ (file-name (git-file-name name version)) (sha256 (base32 - "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8")) + "042v71gkk0xfixcsn82az2fri0n28fgf9d2zcz31bijqmg5q7imj")) (modules '((guix build utils))) - (patches - (search-patches - "minetest-add-MINETEST_MOD_PATH.patch")) (snippet '(begin ;; Delete bundled libraries. @@ -77,12 +75,18 @@ "-DENABLE_FREETYPE=1" "-DENABLE_GETTEXT=1" "-DENABLE_SYSTEM_JSONCPP=TRUE" - (string-append "-DIRRLICHT_INCLUDE_DIR=" - (assoc-ref %build-inputs "irrlicht") + (string-append "-DIRRLICHTMT_INCLUDE_DIR=" + (assoc-ref %build-inputs "irrlicht-for-minetest") "/include/irrlicht") (string-append "-DCURL_INCLUDE_DIR=" (assoc-ref %build-inputs "curl") - "/include/curl")) + "/include/curl") + (string-append "-DZSTD_INCLUDE_DIR=" + (assoc-ref %build-inputs "zstd") + "/include/zstd") + (string-append "-DZSTD_LIBRARY=" + (assoc-ref %build-inputs "zstd") + "/lib/libzstd.so")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-sources @@ -123,7 +127,7 @@ ("freetype" ,freetype) ("gettext" ,gettext-minimal) ("gmp" ,gmp) - ("irrlicht" ,irrlicht) + ("irrlicht-for-minetest" ,irrlicht-for-minetest) ("jsoncpp" ,jsoncpp) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) @@ -134,7 +138,8 @@ ("mesa" ,mesa) ("ncurses" ,ncurses) ("openal" ,openal) - ("sqlite" ,sqlite))) + ("sqlite" ,sqlite) + ("zstd" ,zstd "lib"))) (propagated-inputs (list minetest-data)) (synopsis "Infinite-world block sandbox game") @@ -159,7 +164,7 @@ in different ways.") (file-name (git-file-name name version)) (sha256 (base32 - "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4")))) + "12cpaiww148szvnrc8r8cffwvl33smnrl7k29sh401yv0pbqi3j8")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) |