diff --git a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix index 6eddcc2f9f75..0d44878b480c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix @@ -85,14 +85,11 @@ rec { pkg: predicate: pkg.overrideAttrs ( finalAttrs: previousAttrs: { - preInstall = + nativeBuildInputs = if predicate finalAttrs previousAttrs then - '' - HOME=$(mktemp -d) - '' - + previousAttrs.preInstall or "" + previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.writableTmpDirAsHomeHook ] else - previousAttrs.preInstall or null; + previousAttrs.nativeBuildInputs or null; } ); } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index cf1c84b3fd8b..82c84e713205 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -12,6 +12,7 @@ gopls, tempel, unstableGitUpdater, + writableTmpDirAsHomeHook, }: let @@ -65,6 +66,10 @@ melpaBuild { python ]; + nativeCheckInputs = [ + writableTmpDirAsHomeHook + ]; + files = '' ("*.el" "lsp_bridge.py" @@ -80,7 +85,7 @@ melpaBuild { mkfifo test.log cat < test.log & - HOME=$(mktemp -d) python -m test.test + python -m test.test runHook postCheck ''; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 6375059ddef7..3e603b1d4b92 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -316,9 +316,7 @@ let }); # tries to write a log file to $HOME - insert-shebang = super.insert-shebang.overrideAttrs (attrs: { - HOME = "/tmp"; - }); + insert-shebang = mkHome super.insert-shebang; ivy-rtags = ignoreCompilationError (fix-rtags super.ivy-rtags); # elisp error @@ -665,9 +663,7 @@ let helm-rtags = ignoreCompilationError (fix-rtags super.helm-rtags); # elisp error # tries to write to $HOME - php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { - HOME = "/tmp"; - }); + php-auto-yasnippets = mkHome super.php-auto-yasnippets; racer = super.racer.overrideAttrs (attrs: { postPatch = attrs.postPatch or "" + ''