unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#30133] [PATCH 0/2] gnu: Add eureka and make it find freedoom.
@ 2018-01-15 22:17 nee
  2018-01-15 22:21 ` [bug#30133] [PATCH 1/2] gnu: freedom: add native search-paths nee
  0 siblings, 1 reply; 5+ messages in thread
From: nee @ 2018-01-15 22:17 UTC (permalink / raw)
  To: 30133

Hello, this should be testable by running `guix environment --ad-hoc
freedoom eureka`. Then start eureka and it should show up with the first
map of freedoom loaded and ready to be edited.

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

* [bug#30133] [PATCH 1/2] gnu: freedom: add native search-paths.
  2018-01-15 22:17 [bug#30133] [PATCH 0/2] gnu: Add eureka and make it find freedoom nee
@ 2018-01-15 22:21 ` nee
  2018-01-15 22:21   ` [bug#30133] [PATCH 2/2] gnu: Add eureka nee
  2018-01-16 14:49   ` [bug#30133] [PATCH 1/2] gnu: freedom: add native search-paths Ludovic Courtès
  0 siblings, 2 replies; 5+ messages in thread
From: nee @ 2018-01-15 22:21 UTC (permalink / raw)
  To: 30133; +Cc: nee

From: nee <nee.git@cock.li>

* gnu/packages/games.scm (freedoom) [native-search-paths]: Set DOOMWADDIR and
  DOOMWADPATH, so source ports and map editors can find the freedoom IWAD.
---
 gnu/packages/games.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 288db49f5..1213d87a5 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -348,6 +348,13 @@ tired of cows, a variety of other ASCII-art messengers are available.")
     `(("prboom-plus" ,prboom-plus)))
    (home-page "https://freedoom.github.io/")
    (synopsis "Free content game based on the Doom engine")
+   (native-search-paths
+    (list (search-path-specification
+           (variable "DOOMWADDIR")
+           (files '("share/games/doom")))
+          (search-path-specification
+           (variable "DOOMWADPATH")
+           (files '("share/games/doom")))))
    (description
     "The Freedoom project aims to create a complete free content first person
 shooter game.  Freedoom by itself is just the raw material for a game: it must
-- 
2.15.1

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

* [bug#30133] [PATCH 2/2] gnu: Add eureka.
  2018-01-15 22:21 ` [bug#30133] [PATCH 1/2] gnu: freedom: add native search-paths nee
@ 2018-01-15 22:21   ` nee
  2018-01-16 14:54     ` bug#30133: " Ludovic Courtès
  2018-01-16 14:49   ` [bug#30133] [PATCH 1/2] gnu: freedom: add native search-paths Ludovic Courtès
  1 sibling, 1 reply; 5+ messages in thread
From: nee @ 2018-01-15 22:21 UTC (permalink / raw)
  To: 30133; +Cc: nee

From: nee <nee.git@cock.li>

* gnu/packages/game-development.scm (eureka): New variable.
---
 gnu/packages/game-development.scm | 53 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 363d9a253..7c624a397 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -45,6 +45,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages fltk)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
@@ -1150,3 +1151,55 @@ features design tools such as a visual editor, can import 3D models and
 provide high-quality 3D rendering, it contains an animation editor, and can be
 scripted in a Python-like language.")
     (license license:expat)))
+
+(define-public eureka
+  (package
+    (name "eureka")
+    (version "1.21")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/"
+                                  version "/eureka-"
+                                  ;; version without dots e.g 1.21 => 121
+                                  (string-join (string-split version #\.) "")
+                                  "-source.tar.gz"))
+              (sha256
+               (base32
+                "1a7pf7xi56fcz7jc8layih5gq5m66g2ss4x5j61kzgip07j6rkir"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f
+       #:make-flags
+       (let ((out (assoc-ref %outputs "out")))
+         (list (string-append "PREFIX=" out)))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-before 'build 'prepare-install-directories
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (mkdir-p (string-append out "/bin"))
+               (mkdir-p (string-append out "/share"))
+
+               (with-fluids ((%default-port-encoding #f))
+                 (substitute* "./src/main.cc"
+                   (("/usr/local") out)))
+
+               (substitute* "Makefile"
+                 (("-o root") ""))))))))
+    (inputs `(("mesa" ,mesa)
+              ("libxft" ,libxft)
+              ("libxinerama" ,libxinerama)
+              ("libfontconfig" ,fontconfig)
+              ("libjpeg" ,libjpeg)
+              ("libpng" ,libpng)
+              ("fltk" ,fltk)
+              ("zlib" ,zlib)))
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("xdg-utils" ,xdg-utils)))
+    (synopsis "Doom map editor")
+    (description "Eureka is a map editor for the classic DOOM games, and a few
+related games such as Heretic and Hexen.  It comes with a 3d preview mode and
+a 2D editor view.")
+    (home-page "http://eureka-editor.sourceforge.net/")
+    (license license:gpl2+)))
-- 
2.15.1

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

* [bug#30133] [PATCH 1/2] gnu: freedom: add native search-paths.
  2018-01-15 22:21 ` [bug#30133] [PATCH 1/2] gnu: freedom: add native search-paths nee
  2018-01-15 22:21   ` [bug#30133] [PATCH 2/2] gnu: Add eureka nee
@ 2018-01-16 14:49   ` Ludovic Courtès
  1 sibling, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2018-01-16 14:49 UTC (permalink / raw)
  To: nee; +Cc: nee, 30133

nee@cock.li skribis:

> From: nee <nee.git@cock.li>
>
> * gnu/packages/games.scm (freedoom) [native-search-paths]: Set DOOMWADDIR and
>   DOOMWADPATH, so source ports and map editors can find the freedoom IWAD.

Applied, thanks!

Ludo'.

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

* bug#30133: [PATCH 2/2] gnu: Add eureka.
  2018-01-15 22:21   ` [bug#30133] [PATCH 2/2] gnu: Add eureka nee
@ 2018-01-16 14:54     ` Ludovic Courtès
  0 siblings, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2018-01-16 14:54 UTC (permalink / raw)
  To: nee; +Cc: nee, 30133-done

nee@cock.li skribis:

> From: nee <nee.git@cock.li>
>
> * gnu/packages/game-development.scm (eureka): New variable.

Applied!

“guix environment --ad-hoc freedoom eureka -- eureka” works for me (and
it’s super fast).

Thanks,
Ludo’.

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

end of thread, other threads:[~2018-01-16 14:55 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-15 22:17 [bug#30133] [PATCH 0/2] gnu: Add eureka and make it find freedoom nee
2018-01-15 22:21 ` [bug#30133] [PATCH 1/2] gnu: freedom: add native search-paths nee
2018-01-15 22:21   ` [bug#30133] [PATCH 2/2] gnu: Add eureka nee
2018-01-16 14:54     ` bug#30133: " Ludovic Courtès
2018-01-16 14:49   ` [bug#30133] [PATCH 1/2] gnu: freedom: add native search-paths Ludovic Courtès

Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).