diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-10-02 00:23:05 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-10-02 00:44:10 +0300 |
| commit | f5dd3a703d0b4924005a4eebc66091d8d926d6e5 (patch) | |
| tree | b56d3fd34b3d1949c1aad13d079fef59cbf2c6f3 /pkgs/servers/freeradius/default.nix | |
| parent | 82c0aa7d85183da8031d4c0ac7fd562887d03b89 (diff) | |
| download | nixlib-f5dd3a703d0b4924005a4eebc66091d8d926d6e5.tar nixlib-f5dd3a703d0b4924005a4eebc66091d8d926d6e5.tar.gz nixlib-f5dd3a703d0b4924005a4eebc66091d8d926d6e5.tar.bz2 nixlib-f5dd3a703d0b4924005a4eebc66091d8d926d6e5.tar.lz nixlib-f5dd3a703d0b4924005a4eebc66091d8d926d6e5.tar.xz nixlib-f5dd3a703d0b4924005a4eebc66091d8d926d6e5.tar.zst nixlib-f5dd3a703d0b4924005a4eebc66091d8d926d6e5.zip | |
treewide: Fix more lib.optional misuses
Diffstat (limited to 'pkgs/servers/freeradius/default.nix')
| -rw-r--r-- | pkgs/servers/freeradius/default.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 50d3f0d53ad4..cbafe16623ed 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -15,6 +15,7 @@ , withRedis ? false , libmysql , withMysql ? false +, json_c , withJson ? false , libyubikey , withYubikey ? false @@ -42,16 +43,16 @@ stdenv.mkDerivation rec { version = "3.0.11"; buildInputs = [ autoreconfHook openssl talloc finger_bsd perl ] - ++ optional withLdap [ openldap ] - ++ optional withSqlite [ sqlite ] - ++ optional withPcap [ libpcap ] - ++ optional withCap [ libcap ] - ++ optional withMemcached [ libmemcached ] - ++ optional withRedis [ hiredis ] - ++ optional withMysql [ libmysql ] - ++ optional withJson [ pkgs."json-c" ] - ++ optional withYubikey [ libyubikey ] - ++ optional withCollectd [ collectd ]; + ++ optional withLdap openldap + ++ optional withSqlite sqlite + ++ optional withPcap libpcap + ++ optional withCap libcap + ++ optional withMemcached libmemcached + ++ optional withRedis hiredis + ++ optional withMysql libmysql + ++ optional withJson json_c + ++ optional withYubikey libyubikey + ++ optional withCollectd collectd; # NOTE: are the --with-{lib}-lib-dir and --with-{lib}-include-dir necessary with buildInputs ? |