me
/
guix
Archived
1
0
Fork 0

gnu: golly: Update to 4.2.

* gnu/packages/games.scm (golly): Update to 4.2.
[arguments]: Remove configure phase.
[inputs]: Remove PYTHON-2 and WXWIDGETS-GTK2.  Add PYTHON, SDL2, and
WXWIDGETS.  Remove labels while at it.
master
Marius Bakke 2022-11-27 16:07:16 +01:00
parent 6aac95ae2b
commit ea0e6e5d65
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 4 additions and 18 deletions

View File

@ -1427,7 +1427,7 @@ real-time combat.")
(define-public golly (define-public golly
(package (package
(name "golly") (name "golly")
(version "3.3") (version "4.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/golly/golly/golly-" (uri (string-append "mirror://sourceforge/golly/golly/golly-"
@ -1435,7 +1435,7 @@ real-time combat.")
"-src.tar.gz")) "-src.tar.gz"))
(sha256 (sha256
(base32 (base32
"1j3ksnar4rdam4xiyspgyrs1pifbvxfxkrn65brkwxpx39mpgzc8")))) "0pg9cp83nxc354lizgza5bqdy7z5wh36863203zw6r6s4flji4an"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags (list "CC=gcc" '(#:make-flags (list "CC=gcc"
@ -1445,17 +1445,7 @@ real-time combat.")
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (delete 'configure)
(lambda* (#:key inputs #:allow-other-keys)
;; For some reason, setting the PYTHON_SHLIB make flag doesn't
;; properly set the path to the Python shared library. This
;; substitution acheives the same end by different means.
(substitute* "gui-wx/wxprefs.cpp"
(("pythonlib = wxT\\(STRINGIFY\\(PYTHON_SHLIB\\)\\)")
(string-append "pythonlib = \""
(assoc-ref inputs "python")
"/lib/libpython-2.7.so\"")))
#t))
(replace 'build (replace 'build
(lambda* (#:key make-flags outputs #:allow-other-keys) (lambda* (#:key make-flags outputs #:allow-other-keys)
(with-directory-excursion "gui-wx" (with-directory-excursion "gui-wx"
@ -1485,11 +1475,7 @@ real-time combat.")
(native-inputs (native-inputs
(list lua)) (list lua))
(inputs (inputs
`(("glu" ,glu) (list glu mesa python sdl2 wxwidgets zlib))
("mesa" ,mesa)
("python" ,python-2)
("wxwidgets" ,wxwidgets-gtk2)
("zlib" ,zlib)))
(home-page "http://golly.sourceforge.net/") (home-page "http://golly.sourceforge.net/")
(synopsis "Software for exploring cellular automata") (synopsis "Software for exploring cellular automata")
(description (description