From d819a9f3a5aef818337013c3e49ad22f80c56f70 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Tue, 4 May 2021 17:17:00 -0400 Subject: guix: Simplify local source in package. --- guix.scm | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'guix.scm') 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) -- cgit v1.2.3