Patchwork [3/4] gnu: Remove wrappers from xfd and xfontsel.

login
register
mail settings
Submitter John Darrington
Date Nov. 25, 2016, 7:08 p.m.
Message ID <1480100924-23868-3-git-send-email-jmd@gnu.org>
Download mbox | patch
Permalink /patch/17899/
State New
Headers show

Comments

John Darrington - Nov. 25, 2016, 7:08 p.m.
* gnu/packages/xorg.scm (xfd, xfontsel) [arguments]: Remove wrappers.
  These are no longer necessary since we set XFILESEARCHPATH.
---
 gnu/packages/xorg.scm | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

Patch

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4e79d2d..fb2f61e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3983,21 +3983,12 @@  protocol.")
      ;; By default, it tries to install XFontSel file in
      ;; "/gnu/store/<libxt>/share/X11/app-defaults": it defines this
      ;; directory from 'libxt' (using 'pkg-config').  To put this file
-     ;; inside output dir and to use it properly, we need to configure
-     ;; --with-appdefaultdir and to wrap 'xfontsel' binary.
+     ;; inside output dir we need to configure --with-appdefaultdir
      (let ((app-defaults-dir "/share/X11/app-defaults"))
        `(#:configure-flags
          (list (string-append "--with-appdefaultdir="
-                              %output ,app-defaults-dir))
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'install 'wrap-xfontsel
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let ((out (assoc-ref outputs "out")))
-                 (wrap-program (string-append out "/bin/xfontsel")
-                   `("XAPPLRESDIR" =
-                     (,(string-append out ,app-defaults-dir)))))))))))
-    (inputs
+                              %output ,app-defaults-dir)))))
+     (inputs
      `(("libx11" ,libx11)
        ("libxaw" ,libxaw)
        ("libxmu" ,libxmu)
@@ -4030,15 +4021,7 @@  Font Description (XLFD) full name for a font.")
      (let ((app-defaults-dir "/share/X11/app-defaults"))
        `(#:configure-flags
          (list (string-append "--with-appdefaultdir="
-                              %output ,app-defaults-dir))
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'install 'wrap-xfd
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let ((out (assoc-ref outputs "out")))
-                 (wrap-program (string-append out "/bin/xfd")
-                   `("XAPPLRESDIR" =
-                     (,(string-append out ,app-defaults-dir)))))))))))
+                              %output ,app-defaults-dir)))))
     (inputs
      `(("fontconfig" ,fontconfig)
        ("libx11" ,libx11)