summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2014-06-07 20:18:27 +0000
committerJohn Wiegley <johnw@newartisans.com>2014-06-07 20:18:27 +0000
commitc06613a3af177777b68dfebe74cd019b48e4dcb8 (patch)
tree900b9a190fd08da0f79e026ef9cdf4736291341a /pkgs/applications
parente5e9171578e15d76bff4c1fb29d931633b79e85a (diff)
downloadnixpkgs-c06613a3af177777b68dfebe74cd019b48e4dcb8.tar
nixpkgs-c06613a3af177777b68dfebe74cd019b48e4dcb8.tar.gz
nixpkgs-c06613a3af177777b68dfebe74cd019b48e4dcb8.tar.bz2
nixpkgs-c06613a3af177777b68dfebe74cd019b48e4dcb8.tar.lz
nixpkgs-c06613a3af177777b68dfebe74cd019b48e4dcb8.tar.xz
nixpkgs-c06613a3af177777b68dfebe74cd019b48e4dcb8.tar.zst
nixpkgs-c06613a3af177777b68dfebe74cd019b48e4dcb8.zip
macvim: move the .app bundle to $out/Applications
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/editors/vim/macvim.nix6
1 files 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