summary refs log tree commit diff
diff options
context:
space:
mode:
authorArun Isaac2023-07-06 21:27:01 +0100
committerArun Isaac2023-07-06 21:30:13 +0100
commitad5ab1aa68a7f678f86f2f4782d08fb12d697ca5 (patch)
treed87bcd848760df0aac5d0acd99b36f78494dc0b4
parent9f94c2917006816b51197349eac1693ae5337558 (diff)
downloadguile-xapian-ad5ab1aa68a7f678f86f2f4782d08fb12d697ca5.tar.gz
guile-xapian-ad5ab1aa68a7f678f86f2f4782d08fb12d697ca5.tar.lz
guile-xapian-ad5ab1aa68a7f678f86f2f4782d08fb12d697ca5.zip
.guix: Fix package build in channel and CI job.
Guix channel builds don't play well with current-source-directory.

* .guix/guile-xapian-package.scm (guile-xapian,
guile2.2-xapian)[source]: Use ".." instead of dirname and
current-source-directory. Add constant function as fallback for git
predicate.
-rw-r--r--.guix/guile-xapian-package.scm16
1 files changed, 8 insertions, 8 deletions
diff --git a/.guix/guile-xapian-package.scm b/.guix/guile-xapian-package.scm
index 84a4444..1d33152 100644
--- a/.guix/guile-xapian-package.scm
+++ b/.guix/guile-xapian-package.scm
@@ -27,17 +27,17 @@
 (define-public guile-xapian
   (package
     (inherit guix:guile-xapian)
-    (source (let ((source-directory (dirname (current-source-directory))))
-              (local-file source-directory
-                          #:recursive? #t
-                          #:select? (git-predicate source-directory))))))
+    (source (local-file ".."
+                        #:recursive? #t
+                        #:select? (or (git-predicate "..")
+                                      (const #t))))))
 
 (define-public guile2.2-xapian
   (package
     (inherit guix:guile2.2-xapian)
-    (source (let ((source-directory (dirname (current-source-directory))))
-              (local-file source-directory
-                          #:recursive? #t
-                          #:select? (git-predicate source-directory))))))
+    (source (local-file ".."
+                        #:recursive? #t
+                        #:select? (or (git-predicate "..")
+                                      (const #t))))))
 
 guile-xapian