diff options
| author | Andreas Enge <andreas@enge.fr> | 2025-07-31 10:41:55 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-31 11:52:42 +0200 |
| commit | 9777282c8d35f82b429bf1931ff69e51f17778cd (patch) | |
| tree | 7777c7a74689905d4add25c7796efb9bff5139aa | |
| parent | b6f4446f51974820b8bc2462194ae1e8ab4bfbc9 (diff) | |
gnu: supertux: Fix build.
This is a follow-up to commit f6e59b049b99bb8cd0f31e8771dd62cbe41bca84
* gnu/packages/games.scm (supertux)[arguments]<#:phases>
{patch-squirrel-path}: Rename to...
{adapt-squirrel}: ...this and add a substitution to adapt to the changed API
between squirrel-3.1 and squirrel-3.2.
Fixes: guix/guix#1718
Change-Id: I238c88ed47a565011c34e05f26592e025a396514
| -rw-r--r-- | gnu/packages/games.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d0b1ee8a77..715008aa8e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6929,7 +6929,7 @@ with the \"Stamp\" tool within Tux Paint.") "-DUSE_SYSTEM_PHYSFS=ON") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-squirrel-path + (add-after 'unpack 'adapt-squirrel (lambda* (#:key inputs #:allow-other-keys) (let ((squirrel (assoc-ref inputs "squirrel"))) (substitute* "CMakeLists.txt" @@ -6938,7 +6938,10 @@ with the \"Stamp\" tool within Tux Paint.") (("add_dependencies\\(supertux2_lib squirrel\\)") "") (("\\$\\{SQUIRREL_PREFIX\\}/include") (string-append "${SQUIRREL_PREFIX}/include/squirrel")))) - #t))))) + ;; Adapt to changed API between squirrel-3.1 and 3.2. + (substitute* "src/scripting/wrapper.cpp" + (("sq_getinstanceup\\(vm, 1, &data, nullptr" all) + (string-append all ", 0")))))))) (build-system cmake-build-system) (inputs (list boost curl |