diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-06-08 15:11:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-08 15:11:28 +0100 |
commit | 636695a9105ca20290c7c8c06bdb3871ed265435 (patch) | |
tree | d28d4e5c9427668012c3519aedba4673fb81311a | |
parent | ffd38a5788af9018ef5260a36b0c24c267b786a9 (diff) | |
parent | daef5308ecd87ef560838202e99543cb073a3c6b (diff) | |
download | nixlib-636695a9105ca20290c7c8c06bdb3871ed265435.tar nixlib-636695a9105ca20290c7c8c06bdb3871ed265435.tar.gz nixlib-636695a9105ca20290c7c8c06bdb3871ed265435.tar.bz2 nixlib-636695a9105ca20290c7c8c06bdb3871ed265435.tar.lz nixlib-636695a9105ca20290c7c8c06bdb3871ed265435.tar.xz nixlib-636695a9105ca20290c7c8c06bdb3871ed265435.tar.zst nixlib-636695a9105ca20290c7c8c06bdb3871ed265435.zip |
Merge pull request #41653 from Anton-Latukha/hiawatha
hiawatha: GitHub -> GitLab, clean-up
-rw-r--r-- | pkgs/servers/http/hiawatha/default.nix | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 277fa06a7079..39722c6d831f 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -1,50 +1,50 @@ -{ stdenv, fetchurl, cmake, - libxslt, zlib, libxml2, openssl, - enableSSL ? true, - enableMonitor ? false, - enableRproxy ? true, - enableTomahawk ? false, - enableXSLT ? true, - enableToolkit ? true -}: +{ stdenv +, fetchFromGitLab + +, cmake +, ninja + +, libxslt +, libxml2 -assert enableSSL -> openssl !=null; +, enableSSL ? true +, enableMonitor ? false +, enableRproxy ? true +, enableTomahawk ? false +, enableXSLT ? true +, enableToolkit ? true +}: stdenv.mkDerivation rec { name = "hiawatha-${version}"; version = "10.8.1"; - src = fetchurl { - url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz"; - sha256 = "1f2hlw2lp98b4dx87i7pz7h66vsy2g22b5adfrlij3kj0vfv61w8"; + src = fetchFromGitLab { + owner = "hsleisink"; + repo = "hiawatha"; + rev = "v${version}"; + sha256 = "1428byx0xpzzwyc0j157q70sjx18dykvg6fd5vp70kj85ank0xpa"; }; - buildInputs = [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ libxslt libxml2 ]; prePatch = '' substituteInPlace CMakeLists.txt --replace SETUID "" ''; cmakeFlags = [ - ( if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" ) + ( + # FIXME: 2018-06-08: Uses bundled library, with external ("-DUSE_SYSTEM_MBEDTLS=on") asks: + # ../src/tls.c:46:2: error: #error "The mbed TLS library must be compiled with MBEDTLS_THREADING_PTHREAD and MBEDTLS_THREADING_C enabled." + if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" ) ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" ) ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" ) ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" ) ( if enableXSLT then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" ) ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" ) - "-DWEBROOT_DIR=/var/www/hiawatha" - "-DPID_DIR=/run" - "-DWORK_DIR=/var/lib/hiawatha" - "-DLOG_DIR=/var/log/hiawatha" ]; - # workaround because cmake tries installs stuff outside of nix store - makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - postInstall = '' - mv $out/$out/* $out - rm -rf $out/{var,run} - ''; - meta = with stdenv.lib; { description = "An advanced and secure webserver"; license = licenses.gpl2; |