aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix
diff options
context:
space:
mode:
authorKatharina Fey <kookie@spacekookie.de>2019-10-23 12:12:59 +0000
committerKatharina Fey <kookie@spacekookie.de>2019-10-23 12:12:59 +0000
commit3547597c8c5db5e40e66119587777910e780da3d (patch)
treed5f54a723ee6bb380b918cea195762d271a98ba0 /nixpkgs/pkgs/applications/editors/neovim/wrapper.nix
parent0f74f62ee25ac2d21bd67c29b8efc3ad079a72a8 (diff)
parentf35f0880f2cdbc8c1bc81492811251f120d7a9bc (diff)
Merge commit 'f35f0880f2cdbc8c1bc81492811251f120d7a9bc' into bump-nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/neovim/wrapper.nix')
-rw-r--r--nixpkgs/pkgs/applications/editors/neovim/wrapper.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix
index ec799c0fa49..ffe597b00db 100644
--- a/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix
+++ b/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix
@@ -75,8 +75,9 @@ let
${optionalString withRuby '' --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' }
''
+ optionalString (!stdenv.isDarwin) ''
- # copy and patch the original neovim.desktop file
- mkdir -p $out/share/applications
+ # copy icon and patch the original neovim.desktop file
+ mkdir -p $out/share/{applications,pixmaps}
+ ln -s ${neovim}/share/pixmaps/nvim.png $out/share/pixmaps/nvim.png
substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \
--replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \
--replace 'Name=Neovim' 'Name=WrappedNeovim'