guix: Make it easier to switch the Guile used for builds.
authorDavid Thompson <dthompson2@worcester.edu>
Wed, 6 Nov 2019 13:58:50 +0000 (08:58 -0500)
committerDavid Thompson <dthompson2@worcester.edu>
Wed, 6 Nov 2019 13:58:50 +0000 (08:58 -0500)
guix.scm

index 707e35b..9bb1c64 100644 (file)
--- a/guix.scm
+++ b/guix.scm
              (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
          ("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)))