summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-27 22:36:52 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-27 22:36:52 +0200
commit6a669bda51acb12b4ae4901c1df04fa5965ef1d0 (patch)
tree665010bbd8ab0a25321179c54fa73c49d3ce3989 /guix
parent102f7101b965be55ef1f80e80eec127a982b20a1 (diff)
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).
Diffstat (limited to 'guix')
-rw-r--r--guix/build/profiles.scm3
-rw-r--r--guix/profiles.scm6
2 files changed, 5 insertions, 4 deletions
diff --git a/guix/build/profiles.scm b/guix/build/profiles.scm
index 2becc6b9af..6e316d5d2c 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 c2cf1bf070..0f73455d24 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)