mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-24 20:02:58 +03:00
neovim-qt: 0pre -> 0.2.1, use libmsgpack 1.4
This commit is contained in:
parent
d93f917182
commit
ef46388c48
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let # not very usable ATM
|
||||
version = "0pre-2015-10-18";
|
||||
version = "0.2.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "neovim-qt-${version}";
|
||||
@ -11,8 +11,8 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
repo = "neovim-qt";
|
||||
owner = "equalsraf";
|
||||
rev = "03236e2";
|
||||
sha256 = "0hhwpnj7yfqdk7yiwrq0x6n4xx30brj9clxmxx796421rlcrxypq";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mqs2f7l05q2ayj77czr5fnpr7fa00qrmjdjxglbwxdxswcsz88n";
|
||||
};
|
||||
|
||||
# It tries to download libmsgpack; let's use ours.
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||
|
||||
# Similar enough to FindMsgpack
|
||||
set(MSGPACK_INCLUDE_DIRS ${libmsgpack}/include PARENT_SCOPE)
|
||||
set(MSGPACK_LIBRARIES msgpack PARENT_SCOPE)
|
||||
set(MSGPACK_LIBRARIES msgpackc PARENT_SCOPE)
|
||||
'';
|
||||
in "echo '${use-msgpack}' > third-party/CMakeLists.txt";
|
||||
|
||||
@ -34,9 +34,7 @@ stdenv.mkDerivation {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
mv ./bin/nvim-qt "$out/bin/"
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin"
|
||||
'';
|
||||
|
||||
|
12
pkgs/development/libraries/libmsgpack/1.4.nix
Normal file
12
pkgs/development/libraries/libmsgpack/1.4.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ callPackage, fetchFromGitHub, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msgpack";
|
||||
repo = "msgpack-c";
|
||||
rev = "cpp-${version}";
|
||||
sha256 = "0zlanifi5hmm303pzykpidq5jbapl891zwkwhkllfn8ab1jvzbaa";
|
||||
};
|
||||
})
|
@ -8168,6 +8168,7 @@ in
|
||||
|
||||
libmsgpack = callPackage ../development/libraries/libmsgpack { };
|
||||
libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { };
|
||||
libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { };
|
||||
|
||||
libnatspec = callPackage ../development/libraries/libnatspec (
|
||||
stdenv.lib.optionalAttrs stdenv.isDarwin {
|
||||
@ -14984,6 +14985,7 @@ in
|
||||
|
||||
neovim-qt = callPackage ../applications/editors/neovim/qt.nix {
|
||||
qt5 = qt55;
|
||||
libmsgpack = libmsgpack_1_4;
|
||||
};
|
||||
|
||||
neovim-pygui = pythonPackages.neovim_gui;
|
||||
|
Loading…
Reference in New Issue
Block a user