guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates updated: build-system/gnu: Remove the source directo


From: guix-commits
Subject: branch core-updates updated: build-system/gnu: Remove the source directory from search paths.
Date: Mon, 07 Dec 2020 05:47:47 -0500

This is an automated email from the git hooks/post-receive script.

iyzsong pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 968f541  build-system/gnu: Remove the source directory from search 
paths.
968f541 is described below

commit 968f541c36c28c413f696558505f902d0a133d58
Author: 宋文武 <iyzsong@member.fsf.org>
AuthorDate: Sat Dec 5 11:35:37 2020 +0800

    build-system/gnu: Remove the source directory from search paths.
    
    Fixes <https://issues.guix.gnu.org/44924>.
    
    * guix/build/gnu-build-system.scm (set-paths): Delete 'source' from
    'input-directories'.
---
 guix/build/gnu-build-system.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 5f08b9d..f9e6f50 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -72,7 +72,9 @@ See https://reproducible-builds.org/specs/source-date-epoch/.";
                     (search-paths '()) (native-search-paths '())
                     #:allow-other-keys)
   (define input-directories
-    (match inputs
+    ;; The "source" input can be a directory, but we don't want it for search
+    ;; paths.  See <https://issues.guix.gnu.org/44924>.
+    (match (alist-delete "source" inputs)
       (((_ . dir) ...)
        dir)))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]