all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Kei Kebreau <kei@openmailbox.org>
To: 27421@debbugs.gnu.org
Cc: Kei Kebreau <kei@openmailbox.org>
Subject: [bug#27421] [PATCH 5/5] gnu: openttd-engine: Add 'install-data' phase.
Date: Sun, 18 Jun 2017 13:45:19 -0400	[thread overview]
Message-ID: <20170618174519.32747-4-kei@openmailbox.org> (raw)
In-Reply-To: <20170618174519.32747-1-kei@openmailbox.org>

* gnu/packages/games.scm (openttd-engine): Rename package to openttd.
[arguments]: Add it.
[native-inputs]: Add openttd-opengfx.
---
 gnu/packages/games.scm | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 4214a2f75..112e1c3db 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2236,9 +2236,9 @@ and a game metadata scraper.")
       (home-page "http://www.emulationstation.org")
       (license license:expat))))
 
-(define openttd-engine
+(define-public openttd
   (package
-    (name "openttd-engine")
+    (name "openttd")
     (version "1.7.1")
     (source
      (origin (method url-fetch)
@@ -2269,8 +2269,20 @@ and a game metadata scraper.")
                          (string-append "--with-liblzo2="
                                         lzo "/lib/liblzo2.a")
                          ;; Put the binary in 'bin' instead of 'games'.
-                         "--binary-dir=bin"))))))))
-    (native-inputs `(("pkg-config" ,pkg-config)))
+                         "--binary-dir=bin")))))
+         (add-after 'install 'install-data
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let*
+                 ((opengfx (assoc-ref inputs "opengfx"))
+                  (out (assoc-ref outputs "out"))
+                  (gfx-dir
+                   (string-append out "/share/games/openttd/baseset/opengfx")))
+               (mkdir-p gfx-dir)
+               (copy-recursively opengfx gfx-dir))
+             #t)))))
+    (native-inputs
+     `(("opengfx" ,openttd-opengfx)
+       ("pkg-config" ,pkg-config)))
     (inputs
      `(("allegro" ,allegro-4)
        ("fontconfig" ,fontconfig)
@@ -2316,8 +2328,7 @@ engine.  When you start it you will be prompted to download a graphics set.")
     (arguments
      '(#:make-flags (list "CC=gcc"
                           (string-append "INSTALL_DIR="
-                                         (assoc-ref %outputs "out")
-                                         "/share/openttd/baseset"))
+                                         (assoc-ref %outputs "out")))
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
@@ -2349,11 +2360,6 @@ OpenTTD can be shipped finally fully functional without the need for additional
 downloads.")
     (license license:gpl2)))
 
-(define-public openttd
-  (package
-    (inherit openttd-engine)
-    (name "openttd")))
-
 (define-public pinball
   (package
     (name "pinball")
-- 
2.13.0

  parent reply	other threads:[~2017-06-18 17:46 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-18 17:37 [bug#27421] OpenTTD OpenGFX patches Kei Kebreau
2017-06-18 17:44 ` [bug#27421] [PATCH 1/5] gnu: Add nml Kei Kebreau
2017-06-18 18:01   ` Marius Bakke
2017-06-18 19:01     ` Kei Kebreau
2017-06-18 17:45 ` [bug#27421] [PATCH 2/5] gnu: Add dos2unix Kei Kebreau
2017-06-18 17:45   ` [bug#27421] [PATCH 3/5] gnu: Add grfcodec Kei Kebreau
2017-06-18 18:04     ` Marius Bakke
2017-06-18 17:45   ` [bug#27421] [PATCH 4/5] gnu: Add openttd-opengfx Kei Kebreau
2017-06-18 18:24     ` Marius Bakke
2017-06-18 18:51       ` Kei Kebreau
2017-06-18 17:45   ` Kei Kebreau [this message]
2017-06-18 18:33     ` [bug#27421] [PATCH 5/5] gnu: openttd-engine: Add 'install-data' phase Marius Bakke
2017-06-18 21:03       ` Kei Kebreau
2017-06-20 19:28         ` Marius Bakke
2017-06-20 23:51           ` bug#27421: " Kei Kebreau
2017-06-18 18:02   ` [bug#27421] [PATCH 2/5] gnu: Add dos2unix Marius Bakke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170618174519.32747-4-kei@openmailbox.org \
    --to=kei@openmailbox.org \
    --cc=27421@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.