04/04: profiles: Export 'ensure-writable-directory' and use it.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 6a669bda51acb12b4ae4901c1df04fa5965ef1d0
Author: Ludovic Courtès <address@hidden>
Date:   Wed May 27 22:36:52 2015 +0200

    profiles: Export 'ensure-writable-directory' and use it.
    
    * guix/build/profiles.scm (ensure-writable-directory): Export.
    * guix/profiles.scm (gtk-icon-themes)[build]: Remove '@@' form and use (guix
      build profiles).
---
 guix/build/profiles.scm |    3 ++-
 guix/profiles.scm       |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/build/profiles.scm b/guix/build/profiles.scm
index 2becc6b..6e316d5 100644
--- a/guix/build/profiles.scm
+++ b/guix/build/profiles.scm
@@ -24,7 +24,8 @@
   #:use-module (ice-9 ftw)
   #:use-module (ice-9 match)
   #:use-module (ice-9 pretty-print)
-  #:export (build-profile))
+  #:export (ensure-writable-directory
+            build-profile))
 
 ;;; Commentary:
 ;;;
diff --git a/guix/profiles.scm b/guix/profiles.scm
index c2cf1bf..0f73455 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -631,21 +631,21 @@ creates the GTK+ 'icon-theme.cache' file for each theme."
       #~(begin
           (use-modules (guix build utils)
                        (guix build union)
+                       (guix build profiles)
                        (srfi srfi-26)
                        (ice-9 ftw))
+
           (let* ((destdir  (string-append #$output "/share/icons"))
                  (icondirs (filter file-exists?
                                    (map (cut string-append <> "/share/icons")
                                         '#$(manifest-inputs manifest))))
                  (update-icon-cache (string-append
                                      #+gtk+ "/bin/gtk-update-icon-cache")))
-            ;; XXX: Should move to (guix build utils).
-            (define ensure-writable-directory
-              (@@ (guix build profiles) ensure-writable-directory))
 
             ;; Union all the icons.
             (mkdir-p (string-append #$output "/share"))
             (union-build destdir icondirs)
+
             ;; Update the 'icon-theme.cache' file for each icon theme.
             (for-each
              (lambda (theme)