summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/editors/kakoune
diff options
context:
space:
mode:
authorMichael Leandersson <tripokey@gmail.com>2017-04-12 17:24:17 +0200
committerJörg Thalheim <joerg@thalheim.io>2017-04-13 14:04:56 +0200
commit15bb499df939674c992b1c42e915821193116af2 (patch)
tree81cd56b3d34847ddcde16b69737f1b415733c87d /pkgs/applications/editors/kakoune
parent73c8797d169efffe2207b79615d4af6294cd097e (diff)
kakoune: 2017-02-09-> 2017-04-12
fixes #24847 fixes #24738
Diffstat (limited to 'pkgs/applications/editors/kakoune')
-rw-r--r--pkgs/applications/editors/kakoune/default.nix19
1 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 4590939b516a..067aff5ee69b 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -3,25 +3,20 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "kakoune-nightly-${version}";
- version = "2017-02-09";
+ name = "kakoune-unstable-${version}";
+ version = "2017-04-12";
src = fetchFromGitHub {
repo = "kakoune";
owner = "mawww";
- rev = "9ba1665e58ee84b6596d89e6ef75f7c32e7c6c14";
- sha256 = "1l25mzq64a481qlsyh25rzp5rzajrkx4dq29677z85lnjqn30wbi";
+ rev = "7482d117cc85523e840dff595134dcb9cdc62207";
+ sha256 = "08j611y192n9vln9i94ldlvz3k0sg79dkmfc0b1vczrmaxhpgpfh";
};
buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
- buildPhase = ''
- sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile
- substituteInPlace src/Makefile --replace "boost_regex-mt" "boost_regex"
+ postPatch = ''
export PREFIX=$out
- (cd src && make )
- '';
-
- installPhase = ''
- (cd src && make install)
+ cd src
+ sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' Makefile
'';
meta = {