guix: Switch to new style of input specification.

1 files changed, 14 insertions, 27 deletions

diff --git a/guix.scm b/guix.scm
index 6983ebd..bbdadb3 100644
--- a/guix.scm
+++ b/guix.scm
@@ -64,15 +64,11 @@
   (package
     (inherit guile-opengl)
     (inputs
-     (map (match-lambda
-            (("guile" _)
-             `("guile" ,target-guile))
-            (input input))
-          (package-inputs guile-opengl)))
+     (modify-inputs (package-inputs guile-opengl)
+       (replace "guile" target-guile)))
     (native-inputs
-     (append (package-native-inputs guile-opengl)
-             `(("autoconf" ,autoconf)
-               ("automake" ,automake))))
+     (modify-inputs (package-native-inputs guile-opengl)
+       (append autoconf automake)))
     (arguments
      (substitute-keyword-arguments (package-arguments guile-opengl)
        ((#:phases phases)
@@ -114,14 +110,9 @@
                       (lambda _
                         (zero? (system* "sh" "bootstrap")))))))
       (native-inputs
-       `(("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("pkg-config" ,pkg-config)
-         ("texinfo" ,texinfo)))
+       (list autoconf automake pkg-config texinfo))
       (inputs
-       `(("guile" ,target-guile)
-         ("sdl2" ,sdl2)
-         ("sdl2-image" ,sdl2-image)))
+       (list target-guile sdl2 sdl2-image))
       (synopsis "Guile bindings for SDL2")
       (description "Guile-sdl2 provides pure Guile Scheme bindings to the
 SDL2 C shared library via the foreign function interface.")
@@ -145,20 +136,16 @@ SDL2 C shared library via the foreign function interface.")
          (lambda _
            (invoke "sh" "bootstrap"))))))
   (native-inputs
-   `(("autoconf" ,autoconf)
-     ("automake" ,automake)
-     ("pkg-config" ,pkg-config)
-     ("texinfo" ,texinfo)))
+   (list autoconf automake pkg-config texinfo))
   (inputs
-   `(("freetype" ,freetype)
-     ("guile" ,target-guile)
-     ("libvorbis" ,libvorbis)
-     ("mpg123" ,mpg123)
-     ("openal" ,openal)
-     ("readline" ,readline)))
+   (list freetype
+         target-guile
+         libvorbis
+         mpg123
+         openal
+         readline))
   (propagated-inputs
-   `(("guile-opengl" ,guile3.0-opengl)
-     ("guile-sdl2" ,guile-sdl2)))
+   (list guile3.0-opengl guile-sdl2))
   (synopsis "Game development toolkit for Guile Scheme")
   (description "Chickadee is a game development toolkit for Guile
 Scheme.  It contains all of the basic components needed to develop