nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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).
master
Ludovic Courtès 2015-05-27 22:36:52 +02:00
parent 102f7101b9
commit 6a669bda51
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/build/profiles.scm
View File

@ -24,7 +24,8 @@
#:use-module (ice-9 ftw) #:use-module (ice-9 ftw)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 pretty-print) #:use-module (ice-9 pretty-print)
#:export (build-profile)) #:export (ensure-writable-directory
build-profile))
;;; Commentary: ;;; Commentary:
;;; ;;;

6
guix/profiles.scm
View File

@ -631,21 +631,21 @@ creates the GTK+ 'icon-theme.cache' file for each theme."
#~(begin #~(begin
(use-modules (guix build utils) (use-modules (guix build utils)
(guix build union) (guix build union)
(guix build profiles)
(srfi srfi-26) (srfi srfi-26)
(ice-9 ftw)) (ice-9 ftw))
(let* ((destdir (string-append #$output "/share/icons")) (let* ((destdir (string-append #$output "/share/icons"))
(icondirs (filter file-exists? (icondirs (filter file-exists?
(map (cut string-append <> "/share/icons") (map (cut string-append <> "/share/icons")
'#$(manifest-inputs manifest)))) '#$(manifest-inputs manifest))))
(update-icon-cache (string-append (update-icon-cache (string-append
#+gtk+ "/bin/gtk-update-icon-cache"))) #+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. ;; Union all the icons.
(mkdir-p (string-append #$output "/share")) (mkdir-p (string-append #$output "/share"))
(union-build destdir icondirs) (union-build destdir icondirs)
;; Update the 'icon-theme.cache' file for each icon theme. ;; Update the 'icon-theme.cache' file for each icon theme.
(for-each (for-each
(lambda (theme) (lambda (theme)