diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2024-03-24 09:00:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-24 09:00:12 -0500 |
| commit | 28e51c9d1009582a665a87eb67aae6b53dcc16d2 (patch) | |
| tree | f3c01843c72ade10fb4860786274fc4a826336ea /pkgs/applications/editors/neovim | |
| parent | 9d21bcb0df1f515a5eba8a0e3db2eb892f75ff15 (diff) | |
| parent | 9305ed35ec7f38c6fed16e9d6d0dcd788f007b4d (diff) | |
Merge pull request #258705 from tie/fix-ca-derivations-disallowed
{ruby,neovim}: fix build with content-addressed derivations
Fixes https://github.com/NixOS/nixpkgs/issues/278334Diffstat (limited to 'pkgs/applications/editors/neovim')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index aa5b007c4d1b3..b29e020cbf612 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack-c, libtermkey, libiconv +{ lib, stdenv, fetchFromGitHub, removeReferencesTo, cmake, gettext, msgpack-c, libtermkey, libiconv , libuv, lua, ncurses, pkg-config , unibilium, gperf , libvterm-neovim @@ -121,6 +121,7 @@ in { cmake gettext pkg-config + removeReferencesTo ]; # extra programs test via `make functionaltest` @@ -141,8 +142,11 @@ in { sed -i src/nvim/po/CMakeLists.txt \ -e "s|\$<TARGET_FILE:nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g" ''; + postInstall = '' + find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + + ''; # check that the above patching actually works - disallowedReferences = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua; + disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua; cmakeFlags = [ # Don't use downloaded dependencies. At the end of the configurePhase one |