all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* bug#26472: [PATCH] gnu: Add fillets-ng.
@ 2017-04-13  7:11 Ricardo Wurmus
  2017-04-13 19:32 ` Marius Bakke
  0 siblings, 1 reply; 3+ messages in thread
From: Ricardo Wurmus @ 2017-04-13  7:11 UTC (permalink / raw)
  To: 26472; +Cc: Ricardo Wurmus

* gnu/packages/games.scm (fillets-ng): New variable.
---
 gnu/packages/games.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index a956f0ca4..c71278509 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3738,3 +3738,72 @@ settings.link.libs:Add(\"wavpack\")\n"))
 16 players in a variety of game modes, including Team Deathmatch and Capture
 The Flag.  You can even design your own maps!")
     (license license:bsd-3)))
+
+(define-public fillets-ng
+  (package
+    (name "fillets-ng")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/fillets/"
+                                  "Fish%20Fillets%20-%20Next%20Generation/"
+                                  version "/fillets-ng-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-lua="
+                            (assoc-ref %build-inputs "lua")))
+       #:make-flags
+       (list (string-append "CFLAGS=-I"
+                            (assoc-ref %build-inputs "sdl-union")
+                            "/include/SDL")
+             (string-append "CXXFLAGS=-I"
+                            (assoc-ref %build-inputs "sdl-union")
+                            "/include/SDL"))
+       #:phases
+       (modify-phases %standard-phases
+         ;; Lua 5.1 does not provide it.
+         (add-after 'unpack 'do-not-link-with-lualib
+           (lambda _
+             (substitute* "configure"
+               (("-llualib") ""))
+             #t))
+         (add-after 'install 'install-data
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((data (string-append (assoc-ref outputs "out")
+                                        "/share/games/fillets-ng")))
+               (mkdir-p data)
+               (zero? (system* "tar" "-xvf"
+                               (assoc-ref inputs "fillets-ng-data")
+                               "--strip-components=1"
+                               "-C" data))))))))
+    (inputs
+     `(("sdl-union" ,(sdl-union (list sdl
+                                      sdl-mixer
+                                      sdl-image
+                                      sdl-ttf)))
+       ("fribidi" ,fribidi)
+       ("libx11" ,libx11)
+       ("lua" ,lua-5.1)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("fillets-ng-data"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "mirror://sourceforge/fillets/"
+                               "Fish%20Fillets%20-%20Next%20Generation/"
+                               version "/fillets-ng-data-" version ".tar.gz"))
+           (sha256
+            (base32
+             "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh"))))))
+    (home-page "http://fillets.sourceforge.net/")
+    (synopsis "Puzzle game")
+    (description "Fish Fillets NG is strictly a puzzle game.  The goal in
+every of the seventy levels is always the same: find a safe way out.  The fish
+utter witty remarks about their surroundings, the various inhabitants of their
+underwater realm quarrel among themselves or comment on the efforts of your
+fish.  The whole game is accompanied by quiet, comforting music.")
+    (license license:gpl2+)))
-- 
2.12.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* bug#26472: [PATCH] gnu: Add fillets-ng.
  2017-04-13  7:11 bug#26472: [PATCH] gnu: Add fillets-ng Ricardo Wurmus
@ 2017-04-13 19:32 ` Marius Bakke
  2017-04-13 21:40   ` Ricardo Wurmus
  0 siblings, 1 reply; 3+ messages in thread
From: Marius Bakke @ 2017-04-13 19:32 UTC (permalink / raw)
  To: Ricardo Wurmus, 26472

[-- Attachment #1: Type: text/plain, Size: 4084 bytes --]

Ricardo Wurmus <rekado@elephly.net> writes:

> * gnu/packages/games.scm (fillets-ng): New variable.

Great job submitting these just in time for easter :)

> ---
>  gnu/packages/games.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 69 insertions(+)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index a956f0ca4..c71278509 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -3738,3 +3738,72 @@ settings.link.libs:Add(\"wavpack\")\n"))
>  16 players in a variety of game modes, including Team Deathmatch and Capture
>  The Flag.  You can even design your own maps!")
>      (license license:bsd-3)))
> +
> +(define-public fillets-ng
> +  (package
> +    (name "fillets-ng")
> +    (version "1.0.1")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "mirror://sourceforge/fillets/"
> +                                  "Fish%20Fillets%20-%20Next%20Generation/"
> +                                  version "/fillets-ng-" version ".tar.gz"))

I would mention "fillets-ng-data" somewhere around this general area, so
it isn't forgotten when someone comes here to update it. Looks good
otherwise.

> +              (sha256
> +               (base32
> +                "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:configure-flags
> +       (list (string-append "--with-lua="
> +                            (assoc-ref %build-inputs "lua")))
> +       #:make-flags
> +       (list (string-append "CFLAGS=-I"
> +                            (assoc-ref %build-inputs "sdl-union")
> +                            "/include/SDL")
> +             (string-append "CXXFLAGS=-I"
> +                            (assoc-ref %build-inputs "sdl-union")
> +                            "/include/SDL"))
> +       #:phases
> +       (modify-phases %standard-phases
> +         ;; Lua 5.1 does not provide it.
> +         (add-after 'unpack 'do-not-link-with-lualib
> +           (lambda _
> +             (substitute* "configure"
> +               (("-llualib") ""))
> +             #t))
> +         (add-after 'install 'install-data
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let ((data (string-append (assoc-ref outputs "out")
> +                                        "/share/games/fillets-ng")))
> +               (mkdir-p data)
> +               (zero? (system* "tar" "-xvf"
> +                               (assoc-ref inputs "fillets-ng-data")
> +                               "--strip-components=1"
> +                               "-C" data))))))))
> +    (inputs
> +     `(("sdl-union" ,(sdl-union (list sdl
> +                                      sdl-mixer
> +                                      sdl-image
> +                                      sdl-ttf)))
> +       ("fribidi" ,fribidi)
> +       ("libx11" ,libx11)
> +       ("lua" ,lua-5.1)))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)
> +       ("fillets-ng-data"
> +        ,(origin
> +           (method url-fetch)
> +           (uri (string-append "mirror://sourceforge/fillets/"
> +                               "Fish%20Fillets%20-%20Next%20Generation/"
> +                               version "/fillets-ng-data-" version ".tar.gz"))
> +           (sha256
> +            (base32
> +             "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh"))))))
> +    (home-page "http://fillets.sourceforge.net/")
> +    (synopsis "Puzzle game")
> +    (description "Fish Fillets NG is strictly a puzzle game.  The goal in
> +every of the seventy levels is always the same: find a safe way out.  The fish
> +utter witty remarks about their surroundings, the various inhabitants of their
> +underwater realm quarrel among themselves or comment on the efforts of your
> +fish.  The whole game is accompanied by quiet, comforting music.")
> +    (license license:gpl2+)))
> -- 
> 2.12.2

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#26472: [PATCH] gnu: Add fillets-ng.
  2017-04-13 19:32 ` Marius Bakke
@ 2017-04-13 21:40   ` Ricardo Wurmus
  0 siblings, 0 replies; 3+ messages in thread
From: Ricardo Wurmus @ 2017-04-13 21:40 UTC (permalink / raw)
  To: Marius Bakke; +Cc: 26472-done


Marius Bakke <mbakke@fastmail.com> writes:

>> +(define-public fillets-ng
>> +  (package
>> +    (name "fillets-ng")
>> +    (version "1.0.1")
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (string-append "mirror://sourceforge/fillets/"
>> +                                  "Fish%20Fillets%20-%20Next%20Generation/"
>> +                                  version "/fillets-ng-" version ".tar.gz"))
>
> I would mention "fillets-ng-data" somewhere around this general area, so
> it isn't forgotten when someone comes here to update it. Looks good
> otherwise.

I forgot about adding the comment and pushed it to master with commit
e02f16636461985199b729f975ca6d57ac3cdd53.

I hope it’s clear to people who update this package that they should
also make sure that the data package matches.  I guess they’ll notice
anyway when they change the version string and the hash for
the “fillets-ng-data” input is wrong.

Thanks for the review!

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-04-13 21:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-13  7:11 bug#26472: [PATCH] gnu: Add fillets-ng Ricardo Wurmus
2017-04-13 19:32 ` Marius Bakke
2017-04-13 21:40   ` Ricardo Wurmus

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.