TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: hyperrogue: Update to 10.4j.

Browse source 
* gnu/packages/games.scm (hyperrogue): Update to 10.4j.
[arguments]: Modify 'configure' phase and substitute invoke for system*.
This commit is contained in:
Kei Kebreau 2018-07-22 20:47:10 -04:00
parent 9f2adb2f19
commit 1bb962b4d7
No known key found for this signature in database
GPG key ID: E6A5EE3C19467A0D
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
gnu/packages/games.scm
View file

@ -3472,7 +3472,7 @@ (define-public mrrescue
(define-public hyperrogue (define-public hyperrogue
(package (package
(name "hyperrogue") (name "hyperrogue")
(version "10.0g") (version "10.4j")
;; When updating this package, be sure to update the "hyperrogue-data" ;; When updating this package, be sure to update the "hyperrogue-data"
;; origin in native-inputs. ;; origin in native-inputs.
(source (origin (source (origin
@ -3483,7 +3483,7 @@ (define-public hyperrogue
"-src.tgz")) "-src.tgz"))
(sha256 (sha256
(base32 (base32
"0f68pcnsgl406dhm91ckn3f364bar9m9i5njp9vrmvhvv9p2icy0")))) "0909p4xvbi1c2jc5rdgrf8b1c60fmsaapabsi6yyglh5znkf0k27"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -3495,7 +3495,6 @@ (define-public hyperrogue
(setenv "CPATH" (setenv "CPATH"
(string-append (assoc-ref inputs "sdl-union") (string-append (assoc-ref inputs "sdl-union")
"/include/SDL")))) "/include/SDL"))))
;; Fix font and music paths.
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -3505,17 +3504,18 @@ (define-public hyperrogue
"/share/fonts/truetype")) "/share/fonts/truetype"))
(dejavu-font "DejaVuSans-Bold.ttf") (dejavu-font "DejaVuSans-Bold.ttf")
(music-file "hyperrogue-music.txt")) (music-file "hyperrogue-music.txt"))
;; Fix font and music paths.
(substitute* "basegraph.cpp" (substitute* "basegraph.cpp"
((dejavu-font) ((dejavu-font)
(string-append dejavu-dir "/" dejavu-font))) (string-append dejavu-dir "/" dejavu-font)))
(substitute* "sound.cpp"
(((string-append "\\./" music-file))
(string-append share-dir "/" music-file))
(("sounds/")
(string-append share-dir "/sounds/")))
(substitute* music-file (substitute* music-file
(("\\*/") (("\\*/")
(string-append share-dir "/sounds/")))) (string-append share-dir "/sounds/"))))
;; Fix Makefile.
(substitute* "Makefile"
(("g\\+\\+ langen.cpp")
"g++ langen.cpp ${CXXFLAGS}")
(("savepng.c") "savepng.cpp"))
#t)) #t))
(replace 'install (replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -3532,21 +3532,18 @@ (define-public hyperrogue
(out (assoc-ref outputs "out")) (out (assoc-ref outputs "out"))
(sounds (string-append out "/share/hyperrogue/sounds")) (sounds (string-append out "/share/hyperrogue/sounds"))
(unzip (string-append (assoc-ref inputs "unzip") "/bin/unzip"))) (unzip (string-append (assoc-ref inputs "unzip") "/bin/unzip")))
(and ;; Extract media license information into sounds directory.
;; Extract media license information into sounds directory. (invoke unzip "-j" data
(zero? (string-append
(system* unzip "-j" data "hyperrogue"
(string-append (string-join (string-split ,version #\.) "")
"hyperrogue" "/sounds/credits.txt") "-d" sounds)
(string-join (string-split ,version #\.) "") ;; Extract sounds and music into sounds directory.
"/sounds/credits.txt") "-d" sounds)) (invoke "unzip" "-j" data
;; Extract sounds and music into sounds directory. (string-append
(zero? "hyperrogue"
(system* "unzip" "-j" data (string-join (string-split ,version #\.) "")
(string-append "/*.ogg") "-d" sounds)))))))
"hyperrogue"
(string-join (string-split ,version #\.) "")
"/*.ogg") "-d" sounds)))))))))
(native-inputs (native-inputs
`(("hyperrogue-data" `(("hyperrogue-data"
,(origin ,(origin
@ -3558,7 +3555,7 @@ (define-public hyperrogue
"-win.zip")) "-win.zip"))
(sha256 (sha256
(base32 (base32
"0bnp077qvlmxjlz1jjd6kpghlv9flxc19ac1xq3m3wyq1w9p3pab")))) "0w61iv2rn93hi0q3hxyyyf9xcr8vi9zd7fjvpz5adpgf94jm3zsc"))))
("unzip" ,unzip))) ("unzip" ,unzip)))
(inputs (inputs
`(("font-dejavu" ,font-dejavu) `(("font-dejavu" ,font-dejavu)