Subject: [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'.

From: Ludovic Courtès <[email-masked]>
Date: Mon, 04 May 2020 22:17:24 +0200

Brice Waegeneire <[email-masked]> skribis:

> * gnu/packages/hardware.scm (usgbuard)[source]: Get it from git.
> [arguments]: Rename phase 'patch-makefile' to 'patch-build-scripts',
> adjust it for the source from git and fix 'catch' path.
> [native-inputs]: Add 'libtool'.

[...]

>      (source (origin
> -              (method url-fetch)
> -              (uri (string-append
> -                    "https://github.com/USBGuard/usbguard/releases/download/usbguard-"
> -                    version "/usbguard-" version ".tar.gz"))
> -              (file-name (git-file-name name version))
> -              (sha256
> -               (base32 "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j"))))
> +               (method git-fetch)

In this particular case, perhaps you can keep using the tarball, and then…

[...]

> +             (delete-file "autogen.sh") ; Want network access
> +             (substitute* "configure.ac"
> +               (("/usr/include/catch")
> +                (string-append (assoc-ref inputs "catch") "/include")))

… modify ‘configure’ directly, since it’s a simple and unambiguous
change.  That avoids the extra autotools dependencies (actually Autoconf
and Automake were unnecessary before, no?).

Anyway, one way or another, it’s a worthy change, so go for it!

Ludo’.