[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.
From: |
Kei Kebreau |
Subject: |
01/01: gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'. |
Date: |
Tue, 7 Mar 2017 00:30:25 -0500 (EST) |
kkebreau pushed a commit to branch master
in repository guix.
commit 45321beb7d6cc92ff20ef1811bcc8119bb822ed9
Author: Mekeor Melire <address@hidden>
Date: Mon Mar 6 20:07:45 2017 +0100
gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.
'dmenu' and 'xprop' are necessary to open a new URL in surf.
* gnu/packages/suckless.scm (surf)[inputs]: Add dmenu and xprop.
[arguments]: Add 'set-dmenu-and-xprop-file-name' phase to patch the
paths to the 'dmenu' and 'xprop' binaries in surf's configuration file.
Signed-off-by: Kei Kebreau <address@hidden>
---
gnu/packages/suckless.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index e30a088..80a02e1 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -255,11 +255,20 @@ drawing.")
(string-append "PREFIX=" %output))
#:phases
(modify-phases %standard-phases
- (delete 'configure))))
+ (delete 'configure)
+ ;; Use the right file name for dmenu and xprop.
+ (add-before 'build 'set-dmenu-and-xprop-file-name
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "config.def.h"
+ (("dmenu") (string-append (assoc-ref inputs "dmenu")
"/bin/dmenu"))
+ (("xprop") (string-append (assoc-ref inputs "xprop")
"/bin/xprop")))
+ #t)))))
(inputs
- `(("glib-networking" ,glib-networking)
+ `(("dmenu" ,dmenu)
+ ("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("webkitgtk" ,webkitgtk/gtk+-2)))
+ ("webkitgtk" ,webkitgtk/gtk+-2)
+ ("xprop" ,xprop)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://surf.suckless.org/")