Commit f40761c7 authored by Steve Purcell's avatar Steve Purcell
Browse files

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.
parent a8a4ec36

pkgs/development/lisp-modules/packages.nix

+2 −1
Original line number Diff line number Diff line 
{ 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 {

pkgs/development/lisp-modules/patches/cffi-libffi-darwin-ffi-h.patch

0 → 100644
+14 −0
Original line number Diff line number Diff line 
--- 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