From 2361fd8cf67c2511af9f756ba653fe117d923fa0 Mon Sep 17 00:00:00 2001
From: Ryan Bernstein <ryanbernstein1@gmail.com>
Date: Mon, 27 Nov 2017 13:47:52 -0500
Subject: drip: init at 0.2.4

---
 pkgs/development/tools/drip/default.nix | 36 +++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/development/tools/drip/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix
new file mode 100644
index 00000000000..a62fa042981
--- /dev/null
+++ b/pkgs/development/tools/drip/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, gcc, jdk, which }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "drip";
+  version = "0.2.4";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "flatland";
+    rev = version;
+    sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1";
+   #fetchSubmodules = true;
+  };
+
+  buildInputs = [ gcc jdk which ];
+ 
+  patchPhase = ''
+    mkdir $out
+    cp ./* $out -r
+  '';
+
+  buildPhase = ''
+    $out/bin/drip version
+  '';
+
+  phases = [ "unpackPhase" "patchPhase" "buildPhase" ];
+
+  meta = with stdenv.lib; {
+    description = "a launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster";
+    license = licenses.epl;
+    homepage = https://github.com/flatland/drip;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.rybern ];
+  };
+}
-- 
cgit 1.4.1


From 1a2e2cac3622827f02ce892ded84e6adb4e8c7b0 Mon Sep 17 00:00:00 2001
From: Ryan Bernstein <ryanbernstein1@gmail.com>
Date: Mon, 27 Nov 2017 16:38:43 -0500
Subject: drip: refactor to original repository

---
 pkgs/development/tools/drip/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix
index a62fa042981..877cba061f0 100644
--- a/pkgs/development/tools/drip/default.nix
+++ b/pkgs/development/tools/drip/default.nix
@@ -7,10 +7,9 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     repo = pname;
-    owner = "flatland";
+    owner = "ninjudd";
     rev = version;
     sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1";
-   #fetchSubmodules = true;
   };
 
   buildInputs = [ gcc jdk which ];
@@ -28,8 +27,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "a launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster";
-    license = licenses.epl;
-    homepage = https://github.com/flatland/drip;
+    license = licenses.epl10;
+    homepage = https://github.com/ninjudd/drip;
     platforms = platforms.linux;
     maintainers = [ maintainers.rybern ];
   };
-- 
cgit 1.4.1


From 6f52bf806328b140ad7898d63d53ec59f95179e1 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Tue, 28 Nov 2017 13:36:38 +0000
Subject: drip: provided which at run time

---
 pkgs/development/tools/drip/default.nix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix
index 877cba061f0..17aa94ebf36 100644
--- a/pkgs/development/tools/drip/default.nix
+++ b/pkgs/development/tools/drip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gcc, jdk, which }:
+{ stdenv, fetchFromGitHub, jdk, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -12,21 +12,26 @@ stdenv.mkDerivation rec {
     sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1";
   };
 
-  buildInputs = [ gcc jdk which ];
- 
-  patchPhase = ''
-    mkdir $out
-    cp ./* $out -r
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ jdk ];
+
+  postPatch = ''
+    patchShebangs .
   '';
 
-  buildPhase = ''
+  installPhase = ''
+    runHook preInstall
+    mkdir $out
+    cp ./* $out -r
+    wrapProgram $out/bin/drip \
+      --prefix PATH : "${which}/bin"
     $out/bin/drip version
+    runHook postInstall
   '';
 
-  phases = [ "unpackPhase" "patchPhase" "buildPhase" ];
-
   meta = with stdenv.lib; {
-    description = "a launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster";
+    description = "A launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster";
     license = licenses.epl10;
     homepage = https://github.com/ninjudd/drip;
     platforms = platforms.linux;
-- 
cgit 1.4.1