From c63b5c4c368ef6d7f554332af92bb4a93596fc9e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 4 Aug 2020 09:14:09 +0300 Subject: [PATCH] wrapNeovim: fix darwin build --- pkgs/applications/editors/neovim/wrapper.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 716ec8d06ae..0ac90a8b345 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -116,11 +116,14 @@ let in symlinkJoin { name = "neovim-${stdenv.lib.getVersion neovim}"; + # Remove the symlinks created by symlinkJoin which we need to perform + # extra actions upon postBuild = '' - # Remove the symlinks created by symlinkJoin which we need to perform - # extra actions upon - rm $out/share/applications/nvim.desktop $out/bin/nvim + rm $out/bin/nvim makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs} + '' + + lib.optionalString stdenv.isLinux '' + rm $out/share/applications/nvim.desktop substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ --replace 'Name=Neovim' 'Name=WrappedNeovim'