diff options
| author | Steve Purcell <steve@sanityinc.com> | 2023-10-01 10:19:10 +0200 |
|---|---|---|
| committer | Steve Purcell <steve@sanityinc.com> | 2023-10-01 19:23:55 +0200 |
| commit | f40761c7f8eda43599d9458ed6ac5316c3096ab9 (patch) | |
| tree | cec6990ce1b62436a9e2b6e37b1a90584471762e /pkgs/development/lisp-modules | |
| parent | a8a4ec367a395ae0f4f55d91227c1c39232eb123 (diff) | |
cffi-libffi: use ffi.h patch for darwin
This patch was in lisp-modules-new-obsolete, but not applied here. Without it, cffi-libffi fails to build on darwin.
Diffstat (limited to 'pkgs/development/lisp-modules')
| -rw-r--r-- | pkgs/development/lisp-modules/packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/lisp-modules/patches/cffi-libffi-darwin-ffi-h.patch | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index e0e4972a2fa5c..590a1ea7797bf 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -1,4 +1,4 @@ -{ build-asdf-system, spec, quicklispPackagesFor, pkgs, ... }: +{ build-asdf-system, spec, quicklispPackagesFor, stdenv, pkgs, ... }: let @@ -80,6 +80,7 @@ let url = "https://github.com/cffi/cffi/archive/3f842b92ef808900bf20dae92c2d74232c2f6d3a.tar.gz"; sha256 = "1jilvmbbfrmb23j07lwmkbffc6r35wnvas5s4zjc84i856ccclm2"; }; + patches = optionals stdenv.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ]; }; cl-unicode = build-with-compile-into-pwd { diff --git a/pkgs/development/lisp-modules/patches/cffi-libffi-darwin-ffi-h.patch b/pkgs/development/lisp-modules/patches/cffi-libffi-darwin-ffi-h.patch new file mode 100644 index 0000000000000..15c4a45887550 --- /dev/null +++ b/pkgs/development/lisp-modules/patches/cffi-libffi-darwin-ffi-h.patch @@ -0,0 +1,14 @@ +--- a/libffi/libffi-types.lisp ++++ b/libffi/libffi-types.lisp +@@ -43,9 +43,6 @@ + + (pkg-config-cflags "libffi" :optional t) + +-#+darwin +-(include "ffi/ffi.h") +-#-darwin + (include "ffi.h") + + (cenum status + +Diff finished. Sun Nov 13 00:23:10 2022 \ No newline at end of file |