From 72fd2a609c52bc39119bc239ed039f744dd20dcc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jul 2015 18:15:16 +0200 Subject: [PATCH] ipv6calc: make geoip and geolite-legacy "optional" --- pkgs/tools/networking/ipv6calc/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index f3dadbd72438..a4725e8140f6 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -21,14 +21,16 @@ stdenv.mkDerivation rec { done ''; - configureFlags = '' - --disable-bundled-getopt - --disable-bundled-md5 - --disable-dynamic-load - --enable-shared - --enable-geoip - --with-geoip-db=${geolite-legacy}/share/GeoIP - ''; + configureFlags = [ + "--disable-bundled-getopt" + "--disable-bundled-md5" + "--disable-dynamic-load" + "--enable-shared" + ] ++ stdenv.lib.optional (geoip != null ) [ + "--enable-geoip" + ] ++ stdenv.lib.optional (geolite-legacy != null) [ + "--with-geoip-db=${geolite-legacy}/share/GeoIP" + ]; enableParallelBuilding = true;