about summary refs log tree commit diff
path: root/pkgs/applications/networking
diff options
context:
space:
mode:
authorYurii Izorkin <Izorkin@gmail.com>2018-10-27 23:50:06 +0300
committerRenaud <c0bw3b@users.noreply.github.com>2018-10-27 22:50:06 +0200
commit69fb8a811aed14d0bb8e19fc5709a2a55de48426 (patch)
tree8a972e2a6f0aaf32bd9de6930d4425ee46dd38eb /pkgs/applications/networking
parent59cd6234d48d66041d1a0a12266810f2692d0071 (diff)
downloadnixlib-69fb8a811aed14d0bb8e19fc5709a2a55de48426.tar
nixlib-69fb8a811aed14d0bb8e19fc5709a2a55de48426.tar.gz
nixlib-69fb8a811aed14d0bb8e19fc5709a2a55de48426.tar.bz2
nixlib-69fb8a811aed14d0bb8e19fc5709a2a55de48426.tar.lz
nixlib-69fb8a811aed14d0bb8e19fc5709a2a55de48426.tar.xz
nixlib-69fb8a811aed14d0bb8e19fc5709a2a55de48426.tar.zst
nixlib-69fb8a811aed14d0bb8e19fc5709a2a55de48426.zip
znc: add configure options (#48683)
* znc: add option to disable IPv6

* znc: add option to enable debugging

* znc: add option to enable zlib support

* zncModules: match znc build inputs

znc-buildmod expects modules to be aware of the same libs znc itself is linked to.
Before this: znc-buildmod was passing -lz but zlib was not in the include path
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r--pkgs/applications/networking/znc/default.nix9
-rw-r--r--pkgs/applications/networking/znc/modules.nix2
2 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 861e7d24275d..2f736dd5856d 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -4,6 +4,9 @@
 , withTcl ? false, tcl
 , withCyrus ? true, cyrus_sasl
 , withUnicode ? true, icu
+, withZlib ? true, zlib
+, withIPv6 ? true
+, withDebug ? false
 }:
 
 with stdenv.lib;
@@ -24,7 +27,8 @@ stdenv.mkDerivation rec {
     ++ optional withPython python3
     ++ optional withTcl tcl
     ++ optional withCyrus cyrus_sasl
-    ++ optional withUnicode icu;
+    ++ optional withUnicode icu
+    ++ optional withZlib zlib;
 
   configureFlags = [
     (stdenv.lib.enableFeature withPerl "perl")
@@ -32,7 +36,8 @@ stdenv.mkDerivation rec {
     (stdenv.lib.enableFeature withTcl "tcl")
     (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib")
     (stdenv.lib.enableFeature withCyrus "cyrus")
-  ];
+  ] ++ optional (!withIPv6) [ "--disable-ipv6" ]
+    ++ optional withDebug [ "--enable-debug" ];
 
   meta = with stdenv.lib; {
     description = "Advanced IRC bouncer";
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index a799df2d1ed0..42d2093ee3a0 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -9,6 +9,8 @@ let
     inherit buildPhase;
     inherit installPhase;
 
+    buildInputs = znc.buildInputs;
+
     meta = a.meta // { platforms = stdenv.lib.platforms.unix; };
     passthru.module_name = module_name;
   });