Re: [PATCH 2/2] gnu: Add evilwm.

[ludo@gnu.org (Ludovic Courtès)]

Eric Bavier <ericbavier@openmailbox.org> skribis:

> On Fri, 16 Oct 2015 10:37:43 +0200
> ludo@gnu.org (Ludovic Courtès) wrote:

[...]

>> Since ‘fsf-free’ is a catch-all thing, could you add a comment
>> explaining in one line what kind of license this is?
>
> Upon closer reading of the README, I've updated the license field to
> '(x11-style "file:///README")'.  Of course, second opinions welcome,
> especially since http://directory.fsf.org/wiki/Evilwm claims both
> "Other" and "GPLv2orlater" licenses, and
> http://directory.fsf.org/wiki/Aewm which evilwm is based on claims the
> "Expat" license.

On a cursory look at ‘README’, x11-style sounds right to me.

> From 024a556bdc82a569b6c07873df221ae7e50f1fb0 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Mon, 19 Oct 2015 06:44:23 -0500
> Subject: [PATCH 2/4] font-alias: Install dummy fonts.dir files.
>
> * gnu/packages/xorg.scm (font-alias)[arguments]: New 'install-fonts-dir'
>   phase.

Good catch!  LGTM.

> +                   '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"))

So how did you settle on "0~%"?  :-)

> From d5446a060f7ffe6d419d64bf5c3a0a51736a47d0 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Mon, 19 Oct 2015 06:45:31 -0500
> Subject: [PATCH 3/4] services: xorg: Include font-alias in default FontPath.
>
> * gnu/services/xorg.scm (xorg-configuration-file): Add font-alias directories
>   to xserver.conf FontPath.

OK.

> From 45c524710742550013a8513b641e8d488806f7c9 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Thu, 15 Oct 2015 17:34:26 -0500
> Subject: [PATCH 4/4] gnu: Add evilwm.
>
> * gnu/packages/wm.scm (evilwm): New variable.

[...]

> +    (arguments
> +     `(#:modules ((srfi srfi-26)
> +                  ,@%gnu-build-system-modules)

Note that %GNU-BUILD-SYSTEM-MODULES is the set of modules *imported* in
the build environment (inputs of the derivation), not the set of modules
visible in the build script.  See ‘%default-modules’
vs. ‘%gnu-build-system-modules’ in (guix build-system gnu) for the
difference.

So it should rather be:

  #:modules ((srfi srfi-26)
             (guix build utils)
             (guix build gnu-build-system))

In practice it probably won’t make any difference.

Otherwise LGTM.

Thanks!

Ludo’.