JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #94643 from doronbehar/wrapNeovim

Browse Source 
wrapNeovim: fix darwin build
This commit is contained in:
Daniël de Kok 2020-08-04 08:42:47 +02:00 committed by GitHub
commit a7aae2e34d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/editors/neovim/wrapper.nix
View File

@ -116,11 +116,14 @@ let
in in
symlinkJoin { symlinkJoin {
name = "neovim-${stdenv.lib.getVersion neovim}"; name = "neovim-${stdenv.lib.getVersion neovim}";
postBuild = ''
# Remove the symlinks created by symlinkJoin which we need to perform # Remove the symlinks created by symlinkJoin which we need to perform
# extra actions upon # extra actions upon
rm $out/share/applications/nvim.desktop $out/bin/nvim postBuild = ''
rm $out/bin/nvim
makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs} 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 \ substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \
--replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \
--replace 'Name=Neovim' 'Name=WrappedNeovim' --replace 'Name=Neovim' 'Name=WrappedNeovim'