From ad5ab1aa68a7f678f86f2f4782d08fb12d697ca5 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 6 Jul 2023 21:27:01 +0100 Subject: .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. --- .guix/guile-xapian-package.scm | 16 ++++++++-------- 1 file 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 -- cgit v1.2.3