about summary refs log tree commit diff
path: root/pkgs/servers/http/openresty
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2014-09-20 07:58:39 -0500
committerAustin Seipp <aseipp@pobox.com>2014-09-20 08:21:11 -0500
commit9f15333589a7c3e2bc6de5e2117264813ab8f10c (patch)
tree3bc6d01487caf33fe7d12b5d487903b04d428d09 /pkgs/servers/http/openresty
parent49a58328056871673b7ad3284e6528805bec9360 (diff)
openresty: 1.7.4.1rc1 -> 1.7.4.1rc2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/servers/http/openresty')
-rw-r--r--pkgs/servers/http/openresty/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 571cd215356c1..8c878e856b809 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -7,11 +7,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openresty-${version}";
-  version = "1.7.4.1rc1";
+  version = "1.7.4.1rc2";
 
   src = fetchurl {
     url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz";
-    sha256 = "1j976kmbdv07j3n7bwkpdrjs8hlm13mzzdmfbsfwyxpnk034v0j1";
+    sha256 = "1208snm0g1x2p9ybl8br7mmcl5c4g4xzhm80n5jfjprr85gb7ajx";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ];
@@ -41,8 +41,12 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mv $out/nginx/sbin $out/bin
-    ln -s $out/bin/nginx $out/bin/openresty
+    mv $out/bin/sbin $out/sbin
+
     mv $out/luajit/bin/luajit-2.1.0-alpha $out/bin/luajit-openresty
+    ln -s $out/sbin/nginx $out/sbin/openresty
+    ln -s $out/sbin/nginx $out/bin/openresty
+    ln -s $out/sbin/nginx $out/bin/nginx
   '';
 
   preConfigure = ''