From 4219de070d67e249b14b52ab0a6847bca0108e7f Mon Sep 17 00:00:00 2001
From: "John M. Harris, Jr" <johnmh@openblox.org>
Date: Sun, 1 Oct 2017 12:52:14 -0400
Subject: [PATCH 1/2] kore: init at 2.0.0

---
 lib/maintainers.nix                   |  1 +
 pkgs/development/web/kore/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/web/kore/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8d4b49be461..f384b997a86 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -287,6 +287,7 @@
   joelmo = "Joel Moberg <joel.moberg@gmail.com>";
   joelteon = "Joel Taylor <me@joelt.io>";
   johbo = "Johannes Bornhold <johannes@bornhold.name>";
+  johnmh = "John M. Harris, Jr. <johnmh@openblox.org>";
   johnramsden = "John Ramsden <johnramsden@riseup.net>";
   joko = "Ioannis Koutras <ioannis.koutras@gmail.com>";
   jonafato = "Jon Banafato <jon@jonafato.com>";
diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix
new file mode 100644
index 00000000000..28c121d62cc
--- /dev/null
+++ b/pkgs/development/web/kore/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, openssl }:
+
+stdenv.mkDerivation {
+  name = "kore-2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "jorisvink";
+    repo = "kore";
+    rev = "2.0.0-release";
+    sha256 = "1jjhx9gfjzpsrs7b9rgb46k6v03azrxz9fq7vkn9zyz6zvnjj614";
+  };
+
+  buildInputs = [ openssl ];
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "An easy to use web application framework for C";
+    homepage = https://kore.io;
+    license = licenses.isc;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ johnmh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c945bbe4060..cbe85f4af27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2828,6 +2828,8 @@ with pkgs;
 
   knockknock = callPackage ../tools/security/knockknock { };
 
+  kore = callPackage ../development/web/kore { };
+
   partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { };
 
   kpcli = callPackage ../tools/security/kpcli { };

From 717e6ac0c55afb075e718a0ec01aedc5a2158420 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 1 Oct 2017 18:43:22 +0000
Subject: [PATCH 2/2] kore: fix up

---
 pkgs/development/web/kore/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix
index 28c121d62cc..eac2046a233 100644
--- a/pkgs/development/web/kore/default.nix
+++ b/pkgs/development/web/kore/default.nix
@@ -1,18 +1,27 @@
 { stdenv, fetchFromGitHub, openssl }:
 
-stdenv.mkDerivation {
-  name = "kore-2.0.0";
+stdenv.mkDerivation rec {
+  name = "kore-${version}";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "jorisvink";
     repo = "kore";
-    rev = "2.0.0-release";
+    rev = "${version}-release";
     sha256 = "1jjhx9gfjzpsrs7b9rgb46k6v03azrxz9fq7vkn9zyz6zvnjj614";
   };
 
   buildInputs = [ openssl ];
+
+  postPatch = ''
+    # Do not require kore to be on PATH when it launches itself as a subprocess.
+    sed -ie "s+\"kore\"+\"$out/bin/kore\"+" src/cli.c
+  '';
+
   makeFlags = [ "PREFIX=$(out)" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "An easy to use web application framework for C";
     homepage = https://kore.io;