diff options
author | Luca Bruno <lucabru@src.gnome.org> | 2014-11-10 10:03:52 +0100 |
---|---|---|
committer | Luca Bruno <lucabru@src.gnome.org> | 2014-11-10 10:03:52 +0100 |
commit | 6af0d6974fbbf60c9e43d5bd563e4df0570a61b2 (patch) | |
tree | 62b8785527061f9b872682c6746d9017aea8e448 /pkgs/servers/http | |
parent | 4030ab3ba4988cc96d22f6bf6963cf3727aa2e41 (diff) | |
parent | 9e3137ddf069218f875b385eef27d00d7c0597e1 (diff) | |
download | nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar.gz nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar.bz2 nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar.lz nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar.xz nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar.zst nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/servers/http/apache-modules/tomcat-connectors/default.nix | 23 |
2 files changed, 15 insertions, 16 deletions
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 ]; } |