3 files changed, 9 insertions(+), 21 deletions(-)

M guix/build-system/cmake.scm
M guix/build-system/gnu.scm
M guix/build/gnu-build-system.scm

@@ 42,7 42,6 @@
                      (patches ''()) (patch-flags ''("--batch" "-p1"))
                      (cmake (@ (gnu packages cmake) cmake))
                      (out-of-source? #f)
-                     (path-exclusions ''())
                      (tests? #t)
                      (test-target "test")
                      (parallel-build? #t) (parallel-tests? #f)


@@ 77,7 76,6 @@ provides a 'CMakeLists.txt' file as its build system."
                     #:configure-flags ,configure-flags
                     #:make-flags ,make-flags
                     #:out-of-source? ,out-of-source?
-                    #:path-exclusions ,path-exclusions
                     #:tests? ,tests?
                     #:test-target ,test-target
                     #:parallel-build? ,parallel-build?

@@ 163,7 163,6 @@ System: GCC, GNU Make, Bash, Coreutils, etc."
                     (make-flags ''())
                     (patches ''()) (patch-flags ''("--batch" "-p1"))
                     (out-of-source? #f)
-                    (path-exclusions ''())
                     (tests? #t)
                     (test-target "check")
                     (parallel-build? #t) (parallel-tests? #t)


@@ 205,7 204,6 @@ which could lead to gratuitous input divergence."
                   #:configure-flags ,configure-flags
                   #:make-flags ,make-flags
                   #:out-of-source? ,out-of-source?
-                  #:path-exclusions ,path-exclusions
                   #:tests? ,tests?
                   #:test-target ,test-target
                   #:parallel-build? ,parallel-build?

@@ 48,34 48,26 @@
                     #f
                     dir))
 
-(define* (set-paths #:key inputs (path-exclusions '())
+(define* (set-paths #:key inputs
                     #:allow-other-keys)
-  (define (relevant-input-directories env-var)
-    ;; Return the subset of INPUTS that should be considered when setting
-    ;; ENV-VAR.
-    (match (assoc-ref path-exclusions env-var)
-      (#f
-       (map cdr inputs))
-      ((excluded ...)
-       (filter-map (match-lambda
-                    ((name . dir)
-                     (and (not (member name excluded))
-                          dir)))
-                   inputs))))
+  (define input-directories
+    (match inputs
+      (((_ . dir) ...)
+       dir)))
 
   (set-path-environment-variable "PATH" '("bin")
-                                 (relevant-input-directories "PATH"))
+                                 input-directories)
   (set-path-environment-variable "CPATH" '("include")
-                                 (relevant-input-directories "CPATH"))
+                                 input-directories)
   (set-path-environment-variable "LIBRARY_PATH" '("lib" "lib64")
-                                 (relevant-input-directories "LIBRARY_PATH"))
+                                 input-directories)
 
   ;; FIXME: Eventually move this to the `search-paths' field of the
   ;; `pkg-config' package.
   (set-path-environment-variable "PKG_CONFIG_PATH"
                                  '("lib/pkgconfig" "lib64/pkgconfig"
                                    "share/pkgconfig")
-                                 (relevant-input-directories "PKG_CONFIG_PATH"))
+                                 input-directories)
 
   ;; Dump the environment variables as a shell script, for handy debugging.
   (system "export > environment-variables"))