From 824879cfd4a79fbd99612daed7c798de6da9931f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Nov 2014 19:48:47 +0100
Subject: [PATCH] tomcat-connectors: 1.2.32 -> 1.2.40

---
 .../tomcat-connectors/builder.sh              |  8 -------
 .../tomcat-connectors/default.nix             | 23 ++++++++++++-------
 2 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh

diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh b/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh
deleted file mode 100644
index 52efe537c9bd..000000000000
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-tar xfvz $src
-cd tomcat-connectors-*-src/native
-./configure --with-apxs=$apacheHttpd/bin/apxs --with-java-home=$jdk
-make
-mkdir -p $out/modules
-cp apache-2.0/mod_jk.so $out/modules
diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index 7f764ef5ebcc..0e908acd74b3 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
@@ -1,14 +1,21 @@
-{stdenv, fetchurl, apacheHttpd, jdk}:
+{ stdenv, fetchurl, apacheHttpd, jdk }:
 
-stdenv.mkDerivation {
-  name = "tomcat-connectors-1.2.32";
-  builder = ./builder.sh;
+stdenv.mkDerivation rec {
+  name = "tomcat-connectors-1.2.40";
 
   src = fetchurl {
-    url = http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz;
-    sha256 = "1dim62warzy1hqvc7cvnqsbq475sr6vpgwd6gfmddmkgw155saji";
+    url = "http://www.apache.si/tomcat/tomcat-connectors/jk/${name}-src.tar.gz";
+    sha256 = "0pbh6s19ba5k2kahiiqgx8lz8v4fjllzn0w6hjd08x7z9my38pl9";
   };
 
-  inherit apacheHttpd;
-  buildInputs = [apacheHttpd jdk];
+  configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}";
+
+  sourceRoot = "${name}-src/native";
+
+  installPhase = ''
+    mkdir -p $out/modules
+    cp apache-2.0/mod_jk.so $out/modules
+  '';
+
+  buildInputs = [ apacheHttpd jdk ];
 }