diff mbox series

[bug#77886,v2] gnu: Update openttd dependencies to fix its build

Message ID effe09ff3ce27249da92f7dc7240d8d55578b5b6.1745768796.git.cake@pydis.com
State New
Headers
Series [bug#77886,v2] gnu: Update openttd dependencies to fix its build |

Commit Message

Mark L April 27, 2025, 3:46 p.m. UTC 
  The current version of `openttd-opengfx` has been released in September
2021.

This fixes a few issues with the build of `openttd-opengfx`:

- The make script would try to call `python` instead of `python3`.
- The make script would call `gimp`, but this seems like it broke during
  a Gimp update. A patch for this is in the later Git commits. Since the
  current and most recent version of `openttd-opengfx` has been released
  in September 2021, I've updated this to the latest commit on `master`
  so it can build.
- The older version of `nml` could not build it properly due to missing
  support for `ROAD_WAYPOINTS`.

Change-Id: Ie7b58e267f11d2de86c05c1ea9abcc4e8690eda1
---
 gnu/packages/game-development.scm |  9 ++-------
 gnu/packages/games.scm            | 17 +++++++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)


base-commit: 54cc9c96ec0877b2afa24871c3acd8af27b0d500

Comments

cake--- via Guix-patches via April 27, 2025, 3:50 p.m. UTC | #1 
Hi all,

I just posted an amended patch: my previous patch actually did not set `PYTHON` properly.
Furthermore, there was an error in the Makefile. The build still worked, but I figured it would be nice to correct.

Now one issue is missing, it seems Gimp is trying to call `/usr/bin/env` but that's not present.
But as with the other issues, that doesn't seem like it breaks anything currently..
Christopher Baines April 28, 2025, 7:08 a.m. UTC | #2 
cake--- via Guix-patches via <guix-patches@gnu.org> writes:

> Hi all,
>
> I just posted an amended patch: my previous patch actually did not set `PYTHON` properly.
> Furthermore, there was an error in the Makefile. The build still worked, but I figured it would be nice to correct.
>
> Now one issue is missing, it seems Gimp is trying to call `/usr/bin/env` but that's not present.
> But as with the other issues, that doesn't seem like it breaks anything currently..

Hi,

Would you be able to send some v3 patches, separating the changes out in
to one commit per package?

Thanks,

Chris
diff mbox series

Patch

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 91369089b9..db45b64d41 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -545,19 +545,14 @@  (define-public gzochi
 (define-public nml
   (package
     (name "nml")
-    (version "0.7.2")
+    (version "0.7.6")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "nml" version))
        (sha256
-        (base32 "1kgzkv8pc0blck8c6iqq1idx1nrxyjw2vbnrdisnxizi6zds5l73"))))
+        (base32 "0if99hk9dsiw33iabkrbrpwybv8vl3hpim1cf07sklkshigwxryr"))))
     (build-system python-build-system)
-    ;; TODO: Fix test that fails with
-    ;; "AttributeError: partially initialized module 'nml.nmlop' has no
-    ;; attribute 'ADD' (most likely due to a circular import)"
-    (arguments
-     '(#:tests? #f))
     (propagated-inputs
      (list python-pillow python-ply))
     (home-page "https://github.com/OpenTTD/nml")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 07f199966a..b3c5d122fe 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5238,15 +5238,16 @@  (define openttd-engine
 (define openttd-opengfx
   (package
     (name "openttd-opengfx")
-    (version "7.1")
+    (version "3739bbe9bdcd5bfbb2f720a99667f77d31caf02f")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://cdn.openttd.org/opengfx-releases/"
-                           version "/opengfx-" version "-source.tar.xz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/openttd/opengfx")
+             (commit version)))
        (sha256
         (base32
-         "0nhzlk6s73qvznm5fdwcs1b42g2plf26s5ag39fvck45zm7m48jk"))))
+         "03fhzlv4935868lxpdik7afz8cgsnzwr38a2blzmvy18c4lzc4m3"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -5254,7 +5255,11 @@  (define openttd-opengfx
       #~(list (string-append "CC=" #$(cc-for-target))
               (string-append "INSTALL_DIR="
                              #$output
-                             "/share/games/openttd/baseset/opengfx"))
+                             "/share/games/openttd/baseset/opengfx")
+              "REPO_DATE=20000101"
+              (string-append "PYTHON="
+                             #$(this-package-native-input "python")
+                             "/bin/python3"))
       #:phases
       #~(modify-phases %standard-phases
           (replace 'configure