diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2022-08-24 16:03:32 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2022-08-24 16:03:32 +0200 |
| commit | 1e16af13b02dfe4b56267af2258694f1baf09e6c (patch) | |
| tree | dfe118098bb2a6e33ac8d1aacabf7831ae38cd60 | |
| parent | f323f04326025d1cb2abf6379b35a3fe2e2e53ba (diff) | |
| download | guix-1e16af13b02dfe4b56267af2258694f1baf09e6c.tar.gz | |
gnu: crawl: Update to 0.29.0.
* gnu/packages/games.scm (crawl): Update to 0.29.0. [source]<origin>: Use GIT-FETCH method. [arguments]<#:make-flags>: Match new directory layout. <#:phases>: Add a phase to set version without calling GIT. * gnu/packages/patches/crawl-upgrade-saves.patch: Match new directory layout.
| -rw-r--r-- | gnu/packages/games.scm | 21 | ||||
| -rw-r--r-- | gnu/packages/patches/crawl-upgrade-saves.patch | 4 |
2 files changed, 16 insertions, 9 deletions
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a3278b8918..71abc57dd2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6515,14 +6515,16 @@ fish. The whole game is accompanied by quiet, comforting music.") (define-public crawl (package (name "crawl") - (version "0.28.0") + (version "0.29.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/crawl/crawl/releases/download/" - version "/stone_soup-" version "-nodeps.tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/crawl/crawl") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0irg5w4m127fxcj037kyp9vnyqyq1fi4q64rn6yq92w8z1lf2sss")) + (base32 "0cx67ln5qr4bawidi48ss63wflx7x22901da683c9wvy6m41vks8")) (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs @@ -6552,12 +6554,17 @@ fish. The whole game is accompanied by quiet, comforting music.") "BUILD_LUA=" "BUILD_SQLITE=" "BUILD_ZLIB=" - "-Csource") + "-Ccrawl-ref/source") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-version + (lambda _ + (call-with-output-file "crawl-ref/source/util/release_ver" + (lambda (port) + (display #$version port))))) (add-after 'unpack 'find-SDL-image (lambda _ - (substitute* "source/windowmanager-sdl.cc" + (substitute* "crawl-ref/source/windowmanager-sdl.cc" (("SDL_image.h") "SDL2/SDL_image.h")))) (delete 'configure) (replace 'check diff --git a/gnu/packages/patches/crawl-upgrade-saves.patch b/gnu/packages/patches/crawl-upgrade-saves.patch index 720a94f3e5..831f3c60be 100644 --- a/gnu/packages/patches/crawl-upgrade-saves.patch +++ b/gnu/packages/patches/crawl-upgrade-saves.patch @@ -6,8 +6,8 @@ upgrade is required, but guix nulls all file dates, and crawl would never upgrade saves. diff -ur a/source/database.cc b/source/database.cc ---- a/source/database.cc 2018-08-09 21:49:26.000000000 -0400 -+++ b/source/database.cc 2018-10-07 18:06:41.022445789 -0400 +--- a/crawl-ref/source/database.cc 2018-08-09 21:49:26.000000000 -0400 ++++ b/crawl-ref/source/database.cc 2018-10-07 18:06:41.022445789 -0400 @@ -24,6 +24,7 @@ #include "stringutil.h" #include "syscalls.h" |