diff options
author | Orivej Desh <orivej@gmx.fr> | 2018-08-17 23:53:33 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2018-08-18 23:19:54 +0000 |
commit | 65663f883c4debc2067a11f202725759cedb4fd5 (patch) | |
tree | 55d207e980e0531786a9c90a8f6b70c0775b1743 /pkgs/applications/editors/neovim | |
parent | 0ad3721616039fa009e487908d16bf7984302cbb (diff) |
msgpack: rename from libmsgpack
The project does not use the name "libmsgpack". It variously uses "msgpack" and "msgpack-c", and "msgpackc" for the name of the library.
Diffstat (limited to 'pkgs/applications/editors/neovim')
-rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/editors/neovim/qt.nix | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index a0a14e89860b4..6690e4c9c1b97 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv +{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv , libuv, luaPackages, ncurses, pkgconfig , unibilium, xsel, gperf , libvterm-neovim @@ -25,7 +25,7 @@ let buildInputs = [ libtermkey libuv - libmsgpack + msgpack ncurses libvterm-neovim unibilium diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 48f7b29f407fc..de217cb60f3fb 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper -, libmsgpack, neovim, pythonPackages, qtbase }: +, msgpack, neovim, pythonPackages, qtbase }: stdenv.mkDerivation rec { name = "neovim-qt-${version}"; @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include" - "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so" + "-DMSGPACK_INCLUDE_DIRS=${msgpack}/include" + "-DMSGPACK_LIBRARIES=${msgpack}/lib/msgpackc.so" ]; buildInputs = with pythonPackages; [ - neovim qtbase libmsgpack + neovim qtbase msgpack ] ++ (with pythonPackages; [ jinja2 msgpack python ]); @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' - # avoid cmake trying to download libmsgpack + # avoid cmake trying to download msgpack echo "" > third-party/CMakeLists.txt # we rip out a number of tests that fail in the build env # the GUI tests will never work but the others should - they did before neovim 0.2.0 |