From 7613cc6c054bfc5dc66f657aeb2987a22c342b80 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Fri, 10 Dec 2021 15:56:07 +0100
Subject: [PATCH 1/2] gnu: cl-cffi: Fix some paths.

CFFI can require pkg-config and a GCC toolchain at runtime.
This patch improves the use of the source cl-cffi package from a REPL, but
it's not perfect and using cl-cffi in an environment without explicitly adding
gcc-toolchain to it might not work.

* gnu/packages/lisp-xyz.scm (sbcl-cffi)[native-inputs]: Move pkg-config to ...
  [inputs]: .. here.
  [arguments]: Update 'fix-paths' phase.
---
 gnu/packages/lisp-xyz.scm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 635f8e48cb..9f06be28ee 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -2782,10 +2782,10 @@ (define-public sbcl-cffi
      `(("alexandria" ,sbcl-alexandria)
        ("babel" ,sbcl-babel)
        ("libffi" ,libffi)
+       ("pkg-config" ,pkg-config)
        ("trivial-features" ,sbcl-trivial-features)))
     (native-inputs
      `(("bordeaux-threads" ,sbcl-bordeaux-threads)
-       ("pkg-config" ,pkg-config)
        ("rt" ,sbcl-rt)))
     (arguments
      '(#:phases
@@ -2799,10 +2799,25 @@ (define-public sbcl-cffi
          (add-after 'unpack 'fix-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "libffi/libffi.lisp"
-               (("libffi.so.7" all) (string-append
-                                     (assoc-ref inputs "libffi")
-                                     "/lib/" all)))
+               (("libffi.so.7" all)
+                (string-append (assoc-ref inputs "libffi") "/lib/" all)))
+             (substitute* "libffi/libffi-types.lisp"
+               (("\\(in-package #:cffi\\)" all)
+                (string-append all
+                               "\n #+linux (cc-flags \"-I"
+                               (assoc-ref inputs "libffi")
+                               "/include/\")")))
+             (substitute* "grovel/grovel.lisp"
+               (("\"pkg-config\"")
+                (string-append "\"" (assoc-ref inputs "pkg-config")
+                               "/bin/pkg-config\"")))
+             ;; Force use of (default-toolchain-parameters) which the fixed
+             ;; path to gcc.
              (substitute* "toolchain/c-toolchain.lisp"
+               (("\\(clisp-toolchain-parameters\\)") "nil")
+               (("\\(ecl-toolchain-parameters\\)") "nil")
+               (("\\(mkcl-toolchain-parameters\\)") "nil")
+               (("\\(sbcl-toolchain-parameters\\)") "nil")
                (("\"cc\"") (format #f "~S" (which "gcc"))))))
          (add-after 'build 'install-headers
            (lambda* (#:key outputs #:allow-other-keys)
-- 
2.34.0