diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:16:38 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:16:38 -0400 |
| commit | 0832787e5c463c713d8f24fdec0f52900ff1c2bd (patch) | |
| tree | 5ce20bef711d0d85a22cd041758278d7c176b0f3 /gnu/system | |
| parent | 5b098cc4b937c05d6f685772c66e2aa04490710a (diff) | |
| download | gnu-guix-0832787e5c463c713d8f24fdec0f52900ff1c2bd.tar gnu-guix-0832787e5c463c713d8f24fdec0f52900ff1c2bd.tar.gz | |
Revert "Merge branch 'core-updates'"
This reverts commit 455859a50f88f625d13fc2f304111f02369b366b.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/install.scm | 2 | ||||
| -rw-r--r-- | gnu/system/shadow.scm | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 5acfa2c65b..734a361c37 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -35,7 +35,6 @@ #:use-module (gnu packages grub) #:use-module (gnu packages texinfo) #:use-module (gnu packages compression) - #:use-module (gnu packages nvi) #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (self-contained-tarball @@ -402,7 +401,6 @@ Use Alt-F2 for documentation. ;; space; furthermore util-linux's fdisk is already ;; available here, so we keep that. bash-completion - nvi ;:wq! %base-packages)))) ;; Return it here so 'guix system' can consume it directly. diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index c3948900eb..593117ef36 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -133,6 +133,12 @@ (define (default-skeletons) "Return the default skeleton files for /etc/skel. These files are copied by 'useradd' in the home directory of newly created user accounts." + (define fonts.conf-content + ;; SXML for ~/.config/fontconfig/fonts.conf. This works around the fact + ;; that Fontconfig currently does not such this directory by default, + ;; thereby ignoring fonts installed system-wide (FIXME). + `(fontconfig (dir "/run/current-system/profile/share/fonts"))) + (define copy-guile-wm (with-imported-modules '((guix build utils)) #~(begin @@ -176,6 +182,22 @@ source /etc/profile\n")) (xdefaults (plain-file "Xdefaults" "\ XTerm*utf8: always XTerm*metaSendsEscape: true\n")) + (fonts.conf (computed-file + "fonts.conf" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils) + (sxml simple)) + + (define dir + (string-append #$output + "/fontconfig")) + + (mkdir-p dir) + (call-with-output-file (string-append dir + "/fonts.conf") + (lambda (port) + (sxml->xml '#$fonts.conf-content port))))))) (gdbinit (plain-file "gdbinit" "\ # Tell GDB where to look for separate debugging files. set debug-file-directory ~/.guix-profile/lib/debug\n"))) @@ -184,6 +206,7 @@ set debug-file-directory ~/.guix-profile/lib/debug\n"))) (".zlogin" ,zlogin) (".Xdefaults" ,xdefaults) (".guile-wm" ,guile-wm) + (".config" ,fonts.conf) (".gdbinit" ,gdbinit)))) (define (skeleton-directory skeletons) |