treewide: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv
|
||||
, libuv, lua, ncurses, pkgconfig
|
||||
, unibilium, xsel, gperf
|
||||
, libvterm-neovim
|
||||
@@ -9,7 +9,7 @@
|
||||
, nodejs ? null, fish ? null, python ? null
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
let
|
||||
neovimLuaEnv = lua.withPackages(ps:
|
||||
@@ -104,11 +104,11 @@ in
|
||||
# triggers on buffer overflow bug while running tests
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
|
||||
'';
|
||||
|
||||
postInstall = stdenv.lib.optionalString stdenv.isLinux ''
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, pythonPackages }:
|
||||
{ lib, stdenv, fetchFromGitHub, pythonPackages }:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "neovim-remote";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
, pythonPackages
|
||||
, python3Packages
|
||||
}:
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
neovim:
|
||||
|
||||
@@ -37,7 +37,7 @@ let
|
||||
[ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ];
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "neovim-${stdenv.lib.getVersion neovim}";
|
||||
name = "neovim-${lib.getVersion neovim}";
|
||||
# Remove the symlinks created by symlinkJoin which we need to perform
|
||||
# extra actions upon
|
||||
postBuild = lib.optionalString stdenv.isLinux ''
|
||||
|
||||
Reference in New Issue
Block a user