parent
ffd4ad4d0b
commit
b840977407
1 changed files with 1 additions and 8 deletions
|
@ -2,7 +2,6 @@
|
|||
, libuv, lua, ncurses, pkgconfig
|
||||
, unibilium, xsel, gperf
|
||||
, libvterm-neovim
|
||||
, withJemalloc ? true, jemalloc
|
||||
, glibcLocales ? null, procps ? null
|
||||
|
||||
# now defaults to false because some tests can be flaky (clipboard etc)
|
||||
|
@ -50,8 +49,7 @@ in
|
|||
ncurses
|
||||
neovimLuaEnv
|
||||
unibilium
|
||||
] ++ optional withJemalloc jemalloc
|
||||
++ optional stdenv.isDarwin libiconv
|
||||
] ++ optional stdenv.isDarwin libiconv
|
||||
++ optionals doCheck [ glibcLocales procps ]
|
||||
;
|
||||
|
||||
|
@ -92,16 +90,11 @@ in
|
|||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
export DYLD_LIBRARY_PATH=${jemalloc}/lib
|
||||
substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
|
||||
'';
|
||||
|
||||
postInstall = stdenv.lib.optionalString stdenv.isLinux ''
|
||||
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}
|
||||
|
|
Loading…
Reference in a new issue