diff options
| -rw-r--r-- | aclocal.m4 | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | guix.scm | 51 |
3 files changed, 57 insertions, 6 deletions
@@ -34,8 +34,8 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # for an available version of Guile. # # By default, this macro will search for the latest stable version of -# Guile (e.g. 2.2), falling back to the previous stable version -# (e.g. 2.0) if it is available. If no guile-@var{VERSION}.pc file is +# Guile (e.g. 3.0), falling back to the previous stable version +# (e.g. 2.2) if it is available. If no guile-@var{VERSION}.pc file is # found, an error is signalled. The found version is stored in # @var{GUILE_EFFECTIVE_VERSION}. # @@ -48,7 +48,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # AC_DEFUN([GUILE_PKG], [PKG_PROG_PKG_CONFIG - _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" + _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0])" if test -n "$GUILE_EFFECTIVE_VERSION"; then _guile_tmp="" for v in $_guile_versions_to_search; do @@ -208,7 +208,7 @@ AC_DEFUN([GUILE_SITE_DIR], # as well. # # By default, this macro will search for the latest stable version of -# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older +# Guile (e.g. 3.0). x.y or x.y.z versions can be specified. If an older # version is found, the macro will signal an error. # # The effective version of the found @code{guile} is set to @@ -224,7 +224,7 @@ AC_DEFUN([GUILE_SITE_DIR], AC_DEFUN([GUILE_PROGS], [_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])" if test -z "$_guile_required_version"; then - _guile_required_version=2.2 + _guile_required_version=3.0 fi _guile_candidates=guile diff --git a/configure.ac b/configure.ac index f3c9f96..0563e8b 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_CONFIG_FILES([Makefile config.scm]) AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env]) AC_CONFIG_FILES([scripts/inevitable], [chmod +x scripts/inevitable]) -GUILE_PKG([2.2]) +GUILE_PKG([3.0 2.2]) GUILE_PROGS GUILE_MODULE_REQUIRED([chickadee]) diff --git a/guix.scm b/guix.scm new file mode 100644 index 0000000..5b0c7da --- /dev/null +++ b/guix.scm @@ -0,0 +1,51 @@ +(use-modules + (guix packages) + (guix licenses) + (guix git-download) + (guix build-system gnu) + (gnu packages autotools) + (gnu packages pkg-config) + (gnu packages game-development) + (gnu packages gl) + (gnu packages guile) + (gnu packages sdl)) + +(define guile3.0-chickadee/dev + (let ((commit "ecc4cc242580610f21f5a4d44a3bf44a09dca81e") + (revision "1")) + (package + (inherit guile3.0-chickadee) + (version (git-version (package-version guile3.0-chickadee) + revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.dthompson.us/chickadee.git") + (commit commit))) + (file-name (git-file-name "guile3.0-chickadee" version)) + (sha256 + (base32 + "03z07iqj4fvbf1fmxpfnxahxyn2jq2grxajnfnjjhl0ya8h6jdc7")))) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("pkg-config" ,pkg-config) + ,@(package-native-inputs guile3.0-chickadee)))))) + +(package + (name "inevitable") + (version "0.0.0") + (source #f) + (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-3.0) + ("guile-chickadee" ,guile3.0-chickadee/dev) + ("guile-sdl2" ,guile3.0-sdl2))) + (home-page "https://elephly.net") + (synopsis "This is not a game") + (description "The inevitable game of life and certain death.") + (license gpl3+)) |