From dc9f5c05e228c1b30aef91664ea0c1829a7abd50 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 25 Aug 2024 08:22:23 +0800 Subject: [PATCH 1/2] emacsPackages.elisp-ffi: fix build on darwin https://hydra.nixos.org/build/270423028 --- .../emacs/elisp-packages/manual-packages/elisp-ffi/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix index 59922d11a39e..23bc76eaa525 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix @@ -24,7 +24,7 @@ melpaBuild { preBuild = '' mv ffi.el elisp-ffi.el - make + make CXX=$CXX ''; ignoreCompilationError = false; From 285cbff73da9fefcc2ee5c815b4071031fa0f367 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 25 Aug 2024 08:23:11 +0800 Subject: [PATCH 2/2] emacsPackages.elisp-ffi: install the compiled native binary --- .../elisp-packages/manual-packages/elisp-ffi/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix index 23bc76eaa525..59e0b6b03fae 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix @@ -9,6 +9,7 @@ melpaBuild { pname = "elisp-ffi"; + ename = "ffi"; version = "1.0.0-unstable-2017-05-18"; src = fetchFromGitHub { @@ -18,12 +19,13 @@ melpaBuild { hash = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94="; }; + files = ''(:defaults "ffi-glue")''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libffi ]; preBuild = '' - mv ffi.el elisp-ffi.el make CXX=$CXX '';