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

neovim: Drop jemalloc

Browse Source 
See https://github.com/neovim/neovim/pull/9526.
This commit is contained in:
Manuel Mendez 2019-02-14 22:57:09 -05:00 committed by Matthieu Coudron
parent ffd4ad4d0b
commit b840977407
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/editors/neovim/default.nix
View File

@ -2,7 +2,6 @@
, libuv, lua, ncurses, pkgconfig , libuv, lua, ncurses, pkgconfig
, unibilium, xsel, gperf , unibilium, xsel, gperf
, libvterm-neovim , libvterm-neovim
, withJemalloc ? true, jemalloc
, glibcLocales ? null, procps ? null , glibcLocales ? null, procps ? null
# now defaults to false because some tests can be flaky (clipboard etc) # now defaults to false because some tests can be flaky (clipboard etc)
@ -50,8 +49,7 @@ in
ncurses ncurses
neovimLuaEnv neovimLuaEnv
unibilium unibilium
] ++ optional withJemalloc jemalloc ] ++ optional stdenv.isDarwin libiconv
++ optional stdenv.isDarwin libiconv
++ optionals doCheck [ glibcLocales procps ] ++ optionals doCheck [ glibcLocales procps ]
; ;
@ -92,16 +90,11 @@ in
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];
preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
export DYLD_LIBRARY_PATH=${jemalloc}/lib
substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
''; '';
postInstall = stdenv.lib.optionalString stdenv.isLinux '' postInstall = stdenv.lib.optionalString stdenv.isLinux ''
sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim
'' + stdenv.lib.optionalString (withJemalloc && stdenv.isDarwin) ''
install_name_tool -change libjemalloc.1.dylib \
${jemalloc}/lib/libjemalloc.1.dylib \
$out/bin/nvim
''; '';
# export PATH=$PWD/build/bin:${PATH} # export PATH=$PWD/build/bin:${PATH}