From 6a803b01aedd366a6a46eea6351cc91afb95de33 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 17:46:20 +0200 Subject: [PATCH] bind: remove broken configure flags configure: WARNING: unrecognized options: --without-atf, --without-docbook-xsl, --without-idn, --without-idnlib, --with-randomdev, --with-ecdsa, --with-gost, --without-eddsa, --with-aes, --with-libcap --- pkgs/servers/dns/bind/default.nix | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 7b56061a4aa8..b078b1ae2a83 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,9 +1,8 @@ { config, stdenv, lib, fetchurl, fetchpatch , perl, pkg-config , libcap, libtool, libxml2, openssl, libuv, nghttp2, jemalloc -, enableGSSAPI ? true, libkrb5 , enablePython ? false, python3 -, enableSeccomp ? false, libseccomp +, enableGSSAPI ? true, libkrb5 , buildPackages, nixosTests }: @@ -25,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ libtool libxml2 openssl libuv nghttp2 jemalloc ] ++ lib.optional stdenv.isLinux libcap - ++ lib.optional enableSeccomp libseccomp ++ lib.optional enableGSSAPI libkrb5 ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])); @@ -33,25 +31,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" - "--with-libtool" - (if enablePython then "--with-python" else "--without-python") - "--without-atf" - "--without-dlopen" - "--without-docbook-xsl" - "--without-idn" - "--without-idnlib" "--without-lmdb" - "--without-libjson" - "--without-pkcs11" - "--without-purify" - "--with-randomdev=/dev/random" - "--with-ecdsa" - "--with-gost" - "--without-eddsa" - "--with-aes" - ] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}" - ++ lib.optional enableSeccomp "--enable-seccomp" - ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config" + ] ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config" ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)"; postInstall = ''