summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2019-11-06 08:58:50 -0500
committerDavid Thompson <dthompson2@worcester.edu>2019-11-06 08:58:50 -0500
commitf00914838f1528278206e98e248c358b0404184a (patch)
tree0f2a9c5c67063a07367defab31c0b21be693ccd6
parent31c4a95afad01dc18683e3d36c4f7a131e4bd34f (diff)
guix: Make it easier to switch the Guile used for builds.
-rw-r--r--guix.scm19
1 files changed, 4 insertions, 15 deletions
diff --git a/guix.scm b/guix.scm
index 707e35b..9bb1c64 100644
--- a/guix.scm
+++ b/guix.scm
@@ -52,18 +52,7 @@
(gnu packages maths)
(gnu packages image))
-(define (package-with-guile p guile)
- (package
- (inherit p)
- (inputs
- (map (match-lambda
- (("guile" _)
- `("guile" ,guile))
- (input input))
- (package-inputs p)))))
-
-(define (package-with-guile-2.2 p)
- (package-with-guile p guile-2.2.4))
+(define target-guile guile-next)
(define guile-opengl
(package
@@ -71,7 +60,7 @@
(inputs
(map (match-lambda
(("guile" _)
- `("guile" ,guile-next))
+ `("guile" ,target-guile))
(input input))
(package-inputs guile-opengl)))
(native-inputs
@@ -133,7 +122,7 @@
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs
- `(("guile" ,guile-next)
+ `(("guile" ,target-guile)
("sdl2" ,sdl2)
("sdl2-image" ,sdl2-image)
("sdl2-mixer" ,sdl2-mixer)
@@ -155,7 +144,7 @@ SDL2 C shared library via the foreign function interface.")
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs
- `(("guile" ,guile-next)))
+ `(("guile" ,target-guile)))
(propagated-inputs
`(("guile-opengl" ,guile-opengl)
("guile-sdl2" ,guile-sdl2)))