X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=guix.scm;h=04e52369c13b90590128d41dc29606aed2793e7e;hb=929b6c5c898d33c085aed150fad70734b9f1db42;hp=8cb315c17bbf7f027fbe83703b0547dc3cf19104;hpb=2cb0d7e771236309dcab8c5a4fe04b46f2929223;p=mudsync.git

diff --git a/guix.scm b/guix.scm
index 8cb315c..04e5236 100644
--- a/guix.scm
+++ b/guix.scm
@@ -2,10 +2,6 @@
 ;;; Copyright (C) 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright (C) 2017 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;;
-;;; Also borrowing code from:
-;;; guile-sdl2 --- FFI bindings for SDL2
-;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;;
 ;;; This program is free software: you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation, either version 3 of the License, or
@@ -55,23 +51,6 @@
 
 (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)))))
-
 (define guile-without-select-bug
   (package
    (inherit guile-next)
@@ -98,13 +77,15 @@
 (package
   (name "guile-mudsync")
   (version "git")
-  (source (local-file %source-dir #:recursive? #t #:select? git-file?))
+  (source (local-file %source-dir
+                      #:recursive? #t
+                      #:select? (git-predicate %source-dir)))
   (build-system gnu-build-system)
   (native-inputs `(("autoconf" ,autoconf)
                    ("automake" ,automake)
                    ("guile" ,guile-without-select-bug)
                    ("guile-8sync" ,guile-8sync)
-                   ("guile-irregex" ,guile-irregex)
+                   ("guile-irregex" ,guile2.2-irregex)
                    ("pkg-config" ,pkg-config)
                    ("texinfo" ,texinfo)))
   (arguments