summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix.scm42
1 files changed, 2 insertions, 40 deletions
diff --git a/guix.scm b/guix.scm
index e2af881..f615ede 100644
--- a/guix.scm
+++ b/guix.scm
@@ -60,34 +60,6 @@
(define target-guile guile-3.0-latest)
-(define guile3.0-opengl
- (package
- (inherit guile-opengl)
- (inputs
- (modify-inputs (package-inputs guile-opengl)
- (replace "guile" target-guile)))
- (native-inputs
- (modify-inputs (package-native-inputs guile-opengl)
- (append autoconf automake)))
- (arguments
- (substitute-keyword-arguments (package-arguments guile-opengl)
- ((#:phases phases)
- `(modify-phases ,phases
- (delete 'patch-makefile)
- (add-before 'bootstrap 'patch-configure.ac
- (lambda _
- ;; The Guile version check doesn't work for the 3.0
- ;; pre-release, so just remove it.
- (substitute* "configure.ac"
- (("GUILE_PKG\\(\\[2.2 2.0\\]\\)") ""))
- (substitute* "Makefile.am"
- (("\\$\\(GUILE_EFFECTIVE_VERSION\\)") "3.0")
- (("ccache") "site-ccache"))
- #t))
- (replace 'bootstrap
- (lambda _
- (invoke "autoreconf" "-vfi")))))))))
-
(define guile-sdl2
(let ((commit "e9a7f5e748719ce5b6ccd08ff91861b578034ea6"))
(package
@@ -103,12 +75,7 @@
"0ay7mcar8zs0j5rihwlzi0l46vgg9i93piip4v8a3dzwjx3myr7v"))))
(build-system gnu-build-system)
(arguments
- '(#:make-flags '("GUILE_AUTO_COMPILE=0")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'bootstrap
- (lambda _
- (zero? (system* "sh" "bootstrap")))))))
+ '(#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs
(list autoconf automake pkg-config texinfo))
(inputs
@@ -125,12 +92,7 @@ SDL2 C shared library via the foreign function interface.")
(source (git-checkout (url (dirname (current-filename)))))
(build-system gnu-build-system)
(arguments
- '(#:make-flags '("GUILE_AUTO_COMPILE=0")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'bootstrap
- (lambda _
- (invoke "sh" "bootstrap"))))))
+ '(#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs
(list autoconf automake guile-syntax-highlight pkg-config texinfo))
(inputs