From 53707531232304bc28244478a59a3ef4fb5ebd2d Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 22 Jun 2026 18:39:07 +0800 Subject: [PATCH 1/2] emacs.pkgs.ghostel: fix build on darwin Fixes: #515993 --- .../manual-packages/ghostel/package.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix index 65607c696103..7db1cf189afe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix @@ -6,6 +6,7 @@ stdenv, zig_0_15, emacs, + xcbuild, }: let @@ -31,7 +32,7 @@ let hash = "sha256-CTsG3dXu3DECDbklBAtr2fYou82WNvQ1Q3JET0TmuyM="; }; - nativeBuildInputs = [ zig ]; + nativeBuildInputs = [ zig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; env.EMACS_INCLUDE_DIR = "${emacs}/include"; @@ -47,6 +48,19 @@ let zigBuildFlags = finalAttrs.zigCheckFlags; + postPatch = '' + # https://github.com/dakra/ghostel/issues/446 + substituteInPlace build.zig \ + --replace-fail 'addInstallFile(version_file, "../ghostel-module.version")' \ + 'addInstallFile(version_file, "ghostel-module.version")' + + # remove copy_step + substituteInPlace build.zig \ + --replace-fail 'b.getInstallStep().dependOn(©_step.step);' ' ' \ + --replace-fail 'const copy_step = b.addInstallFile' \ + '_ = b.addInstallFile' + ''; + postConfigure = '' cp -rLT ${finalAttrs.deps} "$ZIG_GLOBAL_CACHE_DIR/p" chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p" From a820ef46e60e7ecb3d26951cb8f10a07ae9580cf Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 22 Jun 2026 20:40:10 +0800 Subject: [PATCH 2/2] emacs.pkgs.ghostel: install ghostel-module.version Co-authored-by: Vonfry --- .../emacs/elisp-packages/manual-packages/ghostel/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix index 7db1cf189afe..c0f90d6b68fd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix @@ -73,11 +73,12 @@ melpaBuild { inherit pname version src; files = '' - (:defaults "etc" "ghostel-module${libExt}") + (:defaults "etc" "ghostel-module${libExt}" "ghostel-module.version") ''; preBuild = '' install ${module}/lib/libghostel-module${libExt} ghostel-module${libExt} + install --mode=444 ${module}/ghostel-module.version ghostel-module.version ''; passthru = {