From 174f5813ef39ead3e42e70003242baadde92156a Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 18 Nov 2013 17:04:30 +0100 Subject: [PATCH] nginx: rtmp module - commited to fast. now it works. --- pkgs/servers/http/nginx/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 48ea4260ae8d..f6f4415e806d 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -5,9 +5,9 @@ let rtmp-ext = fetchgit { - url = git://github.com/arut/nginx-dav-rtmp-module.git; + url = git://github.com/arut/nginx-rtmp-module.git; rev = "1cfb7aeb582789f3b15a03da5b662d1811e2a3f1"; - sha256 = "1dvpq1fg4rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; + sha256 = "03ikfd2l8mzsjwx896l07rdrw5jn7jjfdiyl572yb9jfrnk48fwi"; }; dav-ext = fetchgit { @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { sha256 = "116yfy0k65mwxdkld0w7c3gly77jdqlvga5hpbsw79i3r62kh4mf"; }; - buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; + buildInputs = [ openssl zlib pcre libxml2 libxslt + ] ++ stdenv.lib.optional fullWebDAV expat; patches = if syslog then [ "${syslog-ext}/syslog_1.4.0.patch" ] else []; @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { "--with-http_secure_link_module" # Install destination problems # "--with-http_perl_module" - ] ++ stdenv.lib.optional fullWebDAV "--add-module=${rtmp-ext}" + ] ++ stdenv.lib.optional rtmp "--add-module=${rtmp-ext}" ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}";