summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2021-05-04 17:17:00 -0400
committerDavid Thompson <dthompson2@worcester.edu>2021-05-04 17:20:22 -0400
commitd819a9f3a5aef818337013c3e49ad22f80c56f70 (patch)
treec73ae4bbf584ae51535642a63d440ebb86b5a572
parent2ecdf1e97f415a5818c4dcd7a2ddff6dc7ecdd0f (diff)
guix: Simplify local source in package.
-rw-r--r--guix.scm25
1 files changed, 5 insertions, 20 deletions
diff --git a/guix.scm b/guix.scm
index 4f131f7..84b56c4 100644
--- a/guix.scm
+++ b/guix.scm
@@ -49,27 +49,12 @@
(define %source-dir (dirname (current-filename)))
-(define git-file?
- (let* ((pipe (with-directory-excursion %source-dir
- (open-pipe* OPEN_READ "git" "ls-files")))
- (files (let loop ((lines '()))
- (match (read-line pipe)
- ((? eof-object?)
- (reverse lines))
- (line
- (loop (cons line lines))))))
- (status (close-pipe pipe)))
- (lambda (file stat)
- (match (stat:type stat)
- ('directory #t)
- ((or 'regular 'symlink)
- (any (cut string-suffix? <> file) files))
- (_ #f)))))
-
(package
(name "guile-sdl2")
- (version "0.4.0")
- (source (local-file %source-dir #:recursive? #t #:select? git-file?))
+ (version "0.6.0")
+ (source (local-file %source-dir
+ #:recursive? #t
+ #:select? (git-predicate %source-dir)))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")
@@ -83,7 +68,7 @@
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs
- `(("guile" ,guile-3.0)
+ `(("guile" ,guile-3.0-latest)
("sdl2" ,sdl2)
("sdl2-image" ,sdl2-image)
("sdl2-mixer" ,sdl2-mixer)