From c06613a3af177777b68dfebe74cd019b48e4dcb8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 20:18:27 +0000 Subject: [PATCH] macvim: move the .app bundle to $out/Applications --- pkgs/applications/editors/vim/macvim.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 25a8e5fe9fa..52567d5d31b 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -24,7 +24,7 @@ in mkDerivation rec { patches = [ ./macvim.patch ]; postPatch = '' - substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out" + substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out/Applications" # Don't create custom icons. substituteInPlace src/MacVim/icons/Makefile --replace '$(MAKE) -C makeicns' "" @@ -62,7 +62,7 @@ in mkDerivation rec { ''; postInstall = '' - cp -r src/MacVim/build/Release/MacVim.app $out + cp -r src/MacVim/build/Release/MacVim.app $out/Applications rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view} @@ -74,7 +74,7 @@ in mkDerivation rec { done # Fix rpaths - exe="$out/MacVim.app/Contents/MacOS/Vim" + exe="$out/Applications/MacVim.app/Contents/MacOS/Vim" libperl=$(dirname $(find ${perl} -name "libperl.dylib")) install_name_tool -add_rpath ${luajit}/lib $exe install_name_tool -add_rpath ${tcl}/lib $exe