From 014ffdf3db2db91864500012406d389ec82c70b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Sep 2019 09:09:29 +0200 Subject: [PATCH] powerdns: use default openssl instead of libressl_2_8 Fixes https://github.com/NixOS/nixpkgs/issues/67601 and also see that thread for discussion. --- pkgs/servers/dns/powerdns/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 76c346180cd..1b23f652021 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2, libressl +, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2, openssl , mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip - libyamlcpp libsodium curl opendbx unixODBC botan2 libressl + libyamlcpp libsodium curl opendbx unixODBC botan2 openssl ]; # nix destroy with-modules arguments, when using configureFlags @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote" --with-sqlite3 --with-socketdir=/var/lib/powerdns - --with-libcrypto=${libressl.dev} + --with-libcrypto=${openssl.dev} --enable-libsodium --enable-botan --enable-tools diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0aa788abf79..d27cccbc9c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16260,7 +16260,7 @@ in semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; - powerdns = callPackage ../servers/dns/powerdns { libressl = libressl_2_8; }; + powerdns = callPackage ../servers/dns/powerdns { }; dnsdist = callPackage ../servers/dns/dnsdist { };