2 files changed, 6 insertions(+), 5 deletions(-)

M guix/search-paths.scm
M tests/utils.scm

@@ 35,6 35,7 @@
 
             search-path-specification->sexp
             sexp->search-path-specification
+            string-tokenize*
             evaluate-search-paths
             environment-variable-definition
             search-path-definition))

@@ 21,6 21,7 @@
   #:use-module ((guix config) #:select (%gzip))
   #:use-module (guix utils)
   #:use-module ((guix store) #:select (%store-prefix store-path-package-name))
+  #:use-module ((guix search-paths) #:select (string-tokenize*))
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-64)


@@ 82,11 83,10 @@
     ("foo" "bar" "baz")
     ("foo" "bar" "")
     ("foo" "bar" "baz"))
-  (let ((string-tokenize* (@@ (guix search-paths) string-tokenize*)))
-    (list (string-tokenize* "foo" ":")
-          (string-tokenize* "foo;bar;baz" ";")
-          (string-tokenize* "foo!bar!" "!")
-          (string-tokenize* "foo+-+bar+-+baz" "+-+"))))
+  (list (string-tokenize* "foo" ":")
+        (string-tokenize* "foo;bar;baz" ";")
+        (string-tokenize* "foo!bar!" "!")
+        (string-tokenize* "foo+-+bar+-+baz" "+-+")))
 
 (test-equal "string-replace-substring"
   '("foo BAR! baz"