diff options
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/freeradius/default.nix | 13 |
2 files changed, 10 insertions, 4 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f5d94baf173c..434e72adeddf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -492,7 +492,6 @@ ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix - ./services/networking/freeradius.nix ./services/networking/gale.nix ./services/networking/gateone.nix ./services/networking/gdomap.nix diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index a3e83f4e069e..df2130777bb8 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -21,6 +21,8 @@ , withYubikey ? false , collectd , withCollectd ? false +, curl +, withRest ? false }: assert withSqlite -> sqlite != null; @@ -32,6 +34,7 @@ assert withRedis -> hiredis != null; assert withMysql -> mysql != null; assert withYubikey -> libyubikey != null; assert withCollectd -> collectd != null; +assert withRest -> curl != null && withJson; ## TODO: include windbind optionally (via samba?) ## TODO: include oracle optionally @@ -59,11 +62,13 @@ stdenv.mkDerivation rec { ++ optional withMysql mysql.connector-c ++ optional withJson json_c ++ optional withYubikey libyubikey - ++ optional withCollectd collectd; + ++ optional withCollectd collectd + ++ optional withRest curl; + configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" + "--sysconfdir=/etc" + "--localstatedir=/var" ] ++ optional (!linkOpenssl) "--with-openssl=no"; postPatch = '' @@ -75,6 +80,8 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; + outputs = [ "out" "dev" "man" "doc" ]; + meta = with stdenv.lib; { homepage = https://freeradius.org/; description = "A modular, high performance free RADIUS suite"; |