bug#25991: [PATCH] gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.

[Kei Kebreau]

Mekeor Melire <address@hidden> writes:

> Hello Guix.
>
> I'm sorry, I was too careless about this. The new, revised patch is
> attached inline at the end.
>
> Kei Kebreau <address@hidden> writes:
>
>> Danny Milosavljevic <address@hidden> writes:
>>
>>> (substitute* "tree/config.def.h"
>>>   (("xprop") (string-append (assoc-ref inputs "xprop") "/bin/xprop"))
>>>   (("dmenu") (string-append (assoc-ref inputs "dmenu") "/bin/dmenu")))
>
> -- 
> mekeor ~ EDD3 DFFA 76F6 11C0 145F 9A99 AC85 BAD8 A2F8 C868
>
>>From bb7b07e301305ce7f1d113b10d27e7d4130989c5 Mon Sep 17 00:00:00 2001
> From: Mekeor Melire <address@hidden>
> Date: Mon, 6 Mar 2017 02:36:47 +0100
> Subject: [PATCH] gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.
>
> * gnu/packages/suckless.scm (surf)[inputs]: Add dmenu and xprop.
> ---
>  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 e30a0883a..33eb69ffb 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* "tree/config.def.h"

It turns out we only needed "config.def.h" here.

> +               (("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/";)

Works like a charm.
Pushed to master as 45321beb7d6cc92ff20ef1811bcc8119bb822ed9 with info
added about the new phase.

Thanks for the patch!

signature.asc
Description: PGP signature