From 2d6f0cb1764e24f186ff52002aedf230b6496af5 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 04:28:17 +0100 Subject: postgresql: build < 9.5 with openssl 1.0.2 --- pkgs/servers/sql/postgresql/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ba4fd8e3d38..90dfd7702dc 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -3,7 +3,7 @@ let generic = # dependencies { stdenv, lib, fetchurl, makeWrapper - , glibc, zlib, readline, openssl, icu, systemd, libossp_uuid + , glibc, zlib, readline, openssl, openssl_1_0_2, icu, systemd, libossp_uuid , pkgconfig, libxml2, tzdata # This is important to obtain a version of `libpq` that does not depend on systemd. @@ -32,9 +32,10 @@ let setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = - [ zlib readline openssl libxml2 makeWrapper ] + [ zlib readline libxml2 makeWrapper ] ++ lib.optionals icuEnabled [ icu ] ++ lib.optionals enableSystemd [ systemd ] + ++ [ (if atLeast "9.5" then openssl else openssl_1_0_2) ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ]; -- cgit 1.4.1