From def0189ccd6455d3950c3b3c53dd2c5986d4c3b3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 25 Sep 2012 10:47:00 +0400 Subject: [PATCH] Add support for authentication via user list in MySQL to restund --- pkgs/servers/restund/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index 5cdfdfa22965..e817151e778d 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem}: +{stdenv, fetchurl, zlib, openssl, libre, librem, mysql}: stdenv.mkDerivation rec { version = "0.4.2"; name = "restund-${version}"; @@ -6,17 +6,19 @@ stdenv.mkDerivation rec { url = "http://www.creytiv.com/pub/restund-${version}.tar.gz"; sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2"; }; - buildInputs = [zlib openssl libre librem]; + buildInputs = [zlib openssl libre librem mysql]; makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" "LIBRE_SO=${libre}/lib" "LIBREM_PATH=${librem}" ''PREFIX=$(out)'' + "USE_MYSQL=1" ] ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" ; + NIX_LDFLAGS='' -L${mysql}/lib/mysql ''; meta = { homepage = "http://www.creytiv.com/restund.html"; platforms = with stdenv.lib.platforms; linux;