aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/xorg.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r--gnu/packages/xorg.scm47
1 files changed, 46 insertions, 1 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index f90c75ae10..b85a9c3aaf 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;;
@@ -413,6 +413,23 @@ provided.")
"16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-after
+ 'install 'install-fonts-dir
+ ;; The X font server will not add directories to the font
+ ;; path unless they contain a "fonts.dir" file, so add some
+ ;; dummy files.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (for-each (lambda (d)
+ (call-with-output-file
+ (string-append out "/share/fonts/X11"
+ "/" d "/fonts.dir")
+ (lambda (p)
+ (format p "0~%"))))
+ '("75dpi" "100dpi" "misc" "cyrillic"))
+ #t))))))
(home-page "http://www.x.org/wiki/")
(synopsis "Xorg font aliases")
(description
@@ -3826,6 +3843,34 @@ running on X server.")
(license license:x11)))
+(define-public xlsfonts
+ (package
+ (name "xlsfonts")
+ (version "1.0.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://xorg/individual/app/xlsfonts-"
+ version
+ ".tar.bz2"))
+ (sha256
+ (base32
+ "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("xproto" ,xproto)
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (home-page "http://www.x.org/wiki/")
+ (synopsis "List fonts available from an X server")
+ (description
+ "xlsfonts lists fonts available from an X server via the X11 core
+protocol.")
+ (license license:x11)))
+
+
(define-public xmodmap
(package
(name "xmodmap")