diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2015-06-10 10:05:59 +0200 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2015-06-11 14:42:55 +0200 |
| commit | c7f36cb5f0ddc86d50774ba7181064372e417f85 (patch) | |
| tree | 48825939d10583b2322332510d090c8dc2b2b471 /pkgs/applications/editors | |
| parent | 8ffce0888c3f6138fa915e1a3c5d94b0056de940 (diff) | |
| download | nixpkgs-c7f36cb5f0ddc86d50774ba7181064372e417f85.tar nixpkgs-c7f36cb5f0ddc86d50774ba7181064372e417f85.tar.gz nixpkgs-c7f36cb5f0ddc86d50774ba7181064372e417f85.tar.bz2 nixpkgs-c7f36cb5f0ddc86d50774ba7181064372e417f85.tar.lz nixpkgs-c7f36cb5f0ddc86d50774ba7181064372e417f85.tar.xz nixpkgs-c7f36cb5f0ddc86d50774ba7181064372e417f85.tar.zst nixpkgs-c7f36cb5f0ddc86d50774ba7181064372e417f85.zip | |
fix neovim on darwin
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 599b04e1028..3943a9910a4 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -29,7 +29,8 @@ let buildInputs = [ libtool perl ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ] + ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; enableParallelBuilding = true; @@ -89,7 +90,16 @@ let LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua"; - postInstall = optionalString withPython '' + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH=${jemalloc}/lib + ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + echo patching $out/bin/nvim + install_name_tool -change libjemalloc.1.dylib \ + ${jemalloc}/lib/libjemalloc.1.dylib \ + $out/bin/nvim + '' + optionalString withPython '' ln -s ${pythonEnv}/bin/python $out/bin/nvim-python '' + optionalString withPython3 '' ln -s ${python3Env}/bin/python $out/bin/nvim-python3 |