diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-07-20 11:42:02 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-20 11:42:17 +0200 |
| commit | 7575655212ecfbcd1f04e429c8a7a41f8720d027 (patch) | |
| tree | 558982d3cf50ef6b19ef293850de1f485fde66a6 /gnu/services/xorg.scm | |
| parent | 5d4c90ae02f1e0b42d575bba2d828d63aaf79be5 (diff) | |
| parent | 5f01078129f4eaa4760a14f22761cf357afb6738 (diff) | |
| download | guix-7575655212ecfbcd1f04e429c8a7a41f8720d027.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/xorg.scm')
| -rw-r--r-- | gnu/services/xorg.scm | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 9908b9526b..44d12a7e77 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -158,27 +158,27 @@ EndSection "Return a directory that contains the @code{.conf} files for X.org that includes the @code{share/X11/xorg.conf.d} directories of each package listed in @var{modules}." - (computed-file "xorg.conf.d" - #~(begin - (use-modules (guix build utils) - (srfi srfi-1)) - - (define files - (append-map (lambda (module) - (find-files (string-append - module - "/share/X11/xorg.conf.d") - "\\.conf$")) - (list #$@modules))) - - (mkdir #$output) - (for-each (lambda (file) - (symlink file - (string-append #$output "/" - (basename file)))) - files) - #t) - #:modules '((guix build utils)))) + (with-imported-modules '((guix build utils)) + (computed-file "xorg.conf.d" + #~(begin + (use-modules (guix build utils) + (srfi srfi-1)) + + (define files + (append-map (lambda (module) + (find-files (string-append + module + "/share/X11/xorg.conf.d") + "\\.conf$")) + (list #$@modules))) + + (mkdir #$output) + (for-each (lambda (file) + (symlink file + (string-append #$output "/" + (basename file)))) + files) + #t)))) (define* (xorg-start-command #:key (guile (canonical-package guile-2.0)) |