about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2016-08-03 17:58:22 +0200
committerMichael Raskin <7c6f434c@mail.ru>2016-08-03 17:58:22 +0200
commitef46388c487cc58cd064ba2298a4ea9c7076c28a (patch)
tree182e2cac88e22228291541c7d65c76e75baf3792 /pkgs/applications
parentd93f917182dc5da7aca53fb9a847374ec0c7429a (diff)
downloadnixlib-ef46388c487cc58cd064ba2298a4ea9c7076c28a.tar
nixlib-ef46388c487cc58cd064ba2298a4ea9c7076c28a.tar.gz
nixlib-ef46388c487cc58cd064ba2298a4ea9c7076c28a.tar.bz2
nixlib-ef46388c487cc58cd064ba2298a4ea9c7076c28a.tar.lz
nixlib-ef46388c487cc58cd064ba2298a4ea9c7076c28a.tar.xz
nixlib-ef46388c487cc58cd064ba2298a4ea9c7076c28a.tar.zst
nixlib-ef46388c487cc58cd064ba2298a4ea9c7076c28a.zip
neovim-qt: 0pre -> 0.2.1, use libmsgpack 1.4
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/editors/neovim/qt.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 949be3875d82..778c1cc64457 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -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"
   '';