me/guix
Archived
1
0
Fork 0
Code Activity

gnu: fontconfig: Find fonts in the system profile.

Browse source 
Fixes <http://bugs.gnu.org/22927>.
Reported by myglc2 <myglc2@gmail.com>.

This also reverts commit e71ef7adae.

* gnu/packages/fontutils.scm (fontconfig)[arguments]: Add
/run/current-system/profile/share/fonts to --with-add-fonts configure flag.
* gnu/system/shadow.scm (default-skeletons): Do not create "fonts.conf" file.
This commit is contained in:
Alex Kost 2016-04-03 10:27:45 +03:00
parent ea5d388257
commit f8835ff4b3
2 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/fontutils.scm
View file

@ -95,10 +95,10 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
(assoc-ref %build-inputs "gs-fonts") (assoc-ref %build-inputs "gs-fonts")
"/share/fonts") "/share/fonts")
;; register fonts from user profile ;; Register fonts from user and system profiles.
;; TODO: Add /run/current-system/profile/share/fonts and remove (string-append "--with-add-fonts="
;; the skeleton that works around it from 'default-skeletons'. "~/.guix-profile/share/fonts,"
"--with-add-fonts=~/.guix-profile/share/fonts" "/run/current-system/profile/share/fonts")
;; python is not actually needed ;; python is not actually needed
"PYTHON=false") "PYTHON=false")

23
gnu/system/shadow.scm
View file

@ -131,12 +131,6 @@
(define (default-skeletons) (define (default-skeletons)
"Return the default skeleton files for /etc/skel. These files are copied by "Return the default skeleton files for /etc/skel. These files are copied by
'useradd' in the home directory of newly created user accounts." '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 (define copy-guile-wm
#~(begin #~(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
@ -180,22 +174,6 @@ source /etc/profile\n"))
(xdefaults (plain-file "Xdefaults" "\ (xdefaults (plain-file "Xdefaults" "\
XTerm*utf8: always XTerm*utf8: always
XTerm*metaSendsEscape: true\n")) XTerm*metaSendsEscape: true\n"))
(fonts.conf (computed-file
"fonts.conf"
#~(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))))
#:modules '((guix build utils))))
(gdbinit (plain-file "gdbinit" "\ (gdbinit (plain-file "gdbinit" "\
# Tell GDB where to look for separate debugging files. # Tell GDB where to look for separate debugging files.
set debug-file-directory ~/.guix-profile/lib/debug\n"))) set debug-file-directory ~/.guix-profile/lib/debug\n")))
@ -204,7 +182,6 @@ set debug-file-directory ~/.guix-profile/lib/debug\n")))
(".zlogin" ,zlogin) (".zlogin" ,zlogin)
(".Xdefaults" ,xdefaults) (".Xdefaults" ,xdefaults)
(".guile-wm" ,guile-wm) (".guile-wm" ,guile-wm)
(".config" ,fonts.conf)
(".gdbinit" ,gdbinit)))) (".gdbinit" ,gdbinit))))
(define (skeleton-directory skeletons) (define (skeleton-directory skeletons)