public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerdns: use default openssl instead of libressl_2_8

Browse Source 
Fixes https://github.com/NixOS/nixpkgs/issues/67601
and also see that thread for discussion.
This commit is contained in:
Vladimír Čunát 2019-09-08 09:09:29 +02:00
parent 707c7e4ea8
commit 014ffdf3db
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/dns/powerdns/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { 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 , mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip 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 # 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-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote"
--with-sqlite3 --with-sqlite3
--with-socketdir=/var/lib/powerdns --with-socketdir=/var/lib/powerdns
--with-libcrypto=${libressl.dev} --with-libcrypto=${openssl.dev}
--enable-libsodium --enable-libsodium
--enable-botan --enable-botan
--enable-tools --enable-tools

2
pkgs/top-level/all-packages.nix
View File

@ -16260,7 +16260,7 @@ in
semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; 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 { }; dnsdist = callPackage ../servers/dns/dnsdist { };