Merge pull request #174755 from helsinki-systems/clean/bind9

bind: remove broken configure flags
This commit is contained in:
Jörg Thalheim 2022-06-15 19:55:30 +01:00 committed by GitHub
commit bb52e84b69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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 = ''