diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-08 09:09:29 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-08 09:09:29 +0200 |
| commit | 014ffdf3db2db91864500012406d389ec82c70b7 (patch) | |
| tree | b14bbe8a9efbcc3c9e42692a7c6263d7210b0a07 /pkgs | |
| parent | 707c7e4ea8bfe04b7d70798804fd8765e28b7740 (diff) | |
| download | nixlib-014ffdf3db2db91864500012406d389ec82c70b7.tar nixlib-014ffdf3db2db91864500012406d389ec82c70b7.tar.gz nixlib-014ffdf3db2db91864500012406d389ec82c70b7.tar.bz2 nixlib-014ffdf3db2db91864500012406d389ec82c70b7.tar.lz nixlib-014ffdf3db2db91864500012406d389ec82c70b7.tar.xz nixlib-014ffdf3db2db91864500012406d389ec82c70b7.tar.zst nixlib-014ffdf3db2db91864500012406d389ec82c70b7.zip | |
powerdns: use default openssl instead of libressl_2_8
Fixes https://github.com/NixOS/nixpkgs/issues/67601 and also see that thread for discussion.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/dns/powerdns/default.nix | 6 | ||||
| -rw-r--r-- | 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 76c346180cdb..1b23f6520215 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 0aa788abf79f..d27cccbc9c9a 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 { }; |