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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 25991 in the body.
You can then email your comments to 25991 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Mekeor Melire <mekeor.melire <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.
Date: Mon, 06 Mar 2017 02:55:01 +0100

[Message part 1 (text/plain, inline)]

This is meant to fix bug#25759 “Should 'surf' depend on 'xprop' and
'dmenu'?“:

https://lists.gnu.org/archive/html/bug-guix/2017-02/msg00054.html

I'm not sure if we really want this patch to be merged because there was
not much of a discussion on this proposal on the mailing list.

Also, I hope I'm sending it to the right mailing-list. I'm quite
confused by all the mailing-lists and bug-trackers.

[0001-gnu-surf-Add-dmenu-and-xprop-to-inputs.patch (text/x-patch, inline)]

From 4f11e27908987cc8d607809785726fceadc0535f Mon Sep 17 00:00:00 2001
From: Mekeor Melire <mekeor.melire <at> gmail.com>
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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index e30a0883a..c845a0c72 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -257,9 +257,11 @@ drawing.")
        (modify-phases %standard-phases
          (delete 'configure))))
     (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/")
-- 
2.12.0

[Message part 3 (text/plain, inline)]

--
mekeor ~ EDD3 DFFA 76F6 11C0 145F 9A99 AC85 BAD8 A2F8 C868

Message #8 received at 25991 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Mekeor Melire <mekeor.melire <at> gmail.com>
Cc: 25991 <at> debbugs.gnu.org
Subject: Re: bug#25991: [PATCH] gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.
Date: Mon, 6 Mar 2017 03:09:08 +0100

Hi,

On Mon, 06 Mar 2017 02:55:01 +0100
Mekeor Melire <mekeor.melire <at> gmail.com> wrote:

> This is meant to fix bug#25759 “Should 'surf' depend on 'xprop' and
> 'dmenu'?“:
> 
> https://lists.gnu.org/archive/html/bug-guix/2017-02/msg00054.html
> 
> I'm not sure if we really want this patch to be merged because there was
> not much of a discussion on this proposal on the mailing list.

It's not finished. http://git.suckless.org/surf/tree/config.def.h#n38 invokes xprop and dmenu - and these places would have to be substituted by store references, like:

(substitute* "tree/config.def.h"
  (("xprop") (string-append (assoc-ref inputs "xprop") "/bin/xprop"))
  (("dmenu") (string-append (assoc-ref inputs "dmenu") "/bin/dmenu")))

I'm not sure whether Guix will retain the store references on the next GC, though.

Message #11 received at 25991 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Mekeor Melire <mekeor.melire <at> gmail.com>
Cc: 25991 <at> debbugs.gnu.org
Subject: Re: bug#25991: [PATCH] gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.
Date: Sun, 05 Mar 2017 22:20:09 -0500

[Message part 1 (text/plain, inline)]

Mekeor Melire <mekeor.melire <at> gmail.com> writes:

> This is meant to fix bug#25759 “Should 'surf' depend on 'xprop' and
> 'dmenu'?“:
>
> https://lists.gnu.org/archive/html/bug-guix/2017-02/msg00054.html
>
> I'm not sure if we really want this patch to be merged because there was
> not much of a discussion on this proposal on the mailing list.
>

This patch concerns basic functionality of the software, so I don't
think we'll hear objections.

> Also, I hope I'm sending it to the right mailing-list. I'm quite
> confused by all the mailing-lists and bug-trackers.
>

I'm seeing this in my debbugs interface, so you must be doing something
correctly.

>>From 4f11e27908987cc8d607809785726fceadc0535f Mon Sep 17 00:00:00 2001
> From: Mekeor Melire <mekeor.melire <at> gmail.com>
> 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 | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
> index e30a0883a..c845a0c72 100644
> --- a/gnu/packages/suckless.scm
> +++ b/gnu/packages/suckless.scm
> @@ -257,9 +257,11 @@ drawing.")
>         (modify-phases %standard-phases
>           (delete 'configure))))
>      (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/")

This patch doesn't work as-is, but it's halfway done. The next step
would be to replace the "dmenu" and "xprop" instances in surf's source
code with the path to the two binaries you just included. For example:

(let ((libc (assoc-ref inputs "libc")))
  (substitute* "lib/nscd.c"
    (("/usr/sbin/nscd")
     (string-append libc "/sbin/nscd"))))

This code was taken from line 296 of gnu/packages/admin.scm in the Guix
source tree.

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 25991 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: Mekeor Melire <mekeor.melire <at> gmail.com>, 25991 <at> debbugs.gnu.org
Subject: Re: bug#25991: [PATCH] gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.
Date: Sun, 05 Mar 2017 22:23:48 -0500

[Message part 1 (text/plain, inline)]

Danny Milosavljevic <dannym <at> scratchpost.org> writes:

> Hi,
>
> On Mon, 06 Mar 2017 02:55:01 +0100
> Mekeor Melire <mekeor.melire <at> gmail.com> wrote:
>
>> This is meant to fix bug#25759 “Should 'surf' depend on 'xprop' and
>> 'dmenu'?“:
>> 
>> https://lists.gnu.org/archive/html/bug-guix/2017-02/msg00054.html
>> 
>> I'm not sure if we really want this patch to be merged because there was
>> not much of a discussion on this proposal on the mailing list.
>
> It's not finished. http://git.suckless.org/surf/tree/config.def.h#n38
> invokes xprop and dmenu - and these places would have to be
> substituted by store references, like:
>
> (substitute* "tree/config.def.h"
>   (("xprop") (string-append (assoc-ref inputs "xprop") "/bin/xprop"))
>   (("dmenu") (string-append (assoc-ref inputs "dmenu") "/bin/dmenu")))
>
> I'm not sure whether Guix will retain the store references on the next
> GC, though.

I'm sure Guix does, considering we use this trick for all sorts of
packages, including important ones like shadow.

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 25991 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Kei Kebreau <kei <at> openmailbox.org>
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>, 25991 <at> debbugs.gnu.org
Subject: Re: bug#25991: [PATCH] gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.
Date: Mon, 6 Mar 2017 13:38:28 -0500

[Message part 1 (text/plain, inline)]

On Sun, Mar 05, 2017 at 10:23:48PM -0500, Kei Kebreau wrote:
> Danny Milosavljevic <dannym <at> scratchpost.org> writes:
> > It's not finished. http://git.suckless.org/surf/tree/config.def.h#n38
> > invokes xprop and dmenu - and these places would have to be
> > substituted by store references, like:
> >
> > (substitute* "tree/config.def.h"
> >   (("xprop") (string-append (assoc-ref inputs "xprop") "/bin/xprop"))
> >   (("dmenu") (string-append (assoc-ref inputs "dmenu") "/bin/dmenu")))
> >
> > I'm not sure whether Guix will retain the store references on the next
> > GC, though.
> 
> I'm sure Guix does, considering we use this trick for all sorts of
> packages, including important ones like shadow.

Basically, after building the package, Guix scans the built output for
store references. That is, strings like '/gnu/store/cabba9e...-foo-1.0/'.

If it finds them, they are recorded in a database in $localstatedir.

If the store references are obscured somehow [0], this method fails and
things break.

So, as long as 'tree/config.def.h' is included in the built output of
surf as plaintext, everything should work.

[0] For example, in cases like these:
https://bugs.gnu.org/24703
https://bugs.gnu.org/20765

[signature.asc (application/pgp-signature, inline)]

Message #20 received at 25991 <at> debbugs.gnu.org (full text, mbox):

From: Mekeor Melire <mekeor.melire <at> gmail.com>
To: Kei Kebreau <kei <at> openmailbox.org>
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>, 25991 <at> debbugs.gnu.org,
 Mekeor Melire <mekeor.melire <at> gmail.com>
Subject: Re: bug#25991: [PATCH] gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.
Date: Mon, 06 Mar 2017 20:07:45 +0100

[Message part 1 (text/plain, inline)]

Hello Guix.

I'm sorry, I was too careless about this. The new, revised patch is
attached inline at the end.

Kei Kebreau <kei <at> openmailbox.org> writes:

> Danny Milosavljevic <dannym <at> scratchpost.org> 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

[0001-gnu-surf-Add-dmenu-and-xprop-to-inputs.patch (text/x-patch, inline)]

From bb7b07e301305ce7f1d113b10d27e7d4130989c5 Mon Sep 17 00:00:00 2001
From: Mekeor Melire <mekeor.melire <at> gmail.com>
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"
+               (("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/")
-- 
2.12.0

Message #23 received at 25991 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Mekeor Melire <mekeor.melire <at> gmail.com>
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>, 25991 <at> debbugs.gnu.org
Subject: Re: bug#25991: [PATCH] gnu: surf: Add 'dmenu' and 'xprop' to 'inputs'.
Date: Tue, 07 Mar 2017 00:36:05 -0500

[Message part 1 (text/plain, inline)]

Mekeor Melire <mekeor.melire <at> gmail.com> writes:

> Hello Guix.
>
> I'm sorry, I was too careless about this. The new, revised patch is
> attached inline at the end.
>
> Kei Kebreau <kei <at> openmailbox.org> writes:
>
>> Danny Milosavljevic <dannym <at> scratchpost.org> 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 <mekeor.melire <at> gmail.com>
> 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 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.