From 42eb460868fc4dd0fca6a1a86b24a3e1ed5d3436 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 14 Feb 2021 16:31:53 +0900 Subject: [PATCH 1/2] erlang: allow openssl override --- pkgs/development/interpreters/erlang/generic-builder.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 538b4224909c..f78c8e937b49 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -20,6 +20,7 @@ , javacSupport ? false, javacPackages ? [ openjdk8 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , withSystemd ? stdenv.isLinux # systemd support in epmd +, opensslPackage ? openssl , wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" @@ -52,7 +53,7 @@ in stdenv.mkDerivation ({ nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ]; - buildInputs = [ ncurses openssl ] + buildInputs = [ ncurses opensslPackage ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages @@ -81,7 +82,7 @@ in stdenv.mkDerivation ({ ./otp_build autoconf ''; - configureFlags = [ "--with-ssl=${openssl.dev}" ] + configureFlags = [ "--with-ssl=${opensslPackage.dev}" ] ++ optional enableThreads "--enable-threads" ++ optional enableSmpSupport "--enable-smp-support" ++ optional enableKernelPoll "--enable-kernel-poll" From fb0c10bbdb8368b38fb618115efe1fefb8f8c83f Mon Sep 17 00:00:00 2001 From: Raphael Megzari Date: Tue, 16 Feb 2021 06:47:17 +0900 Subject: [PATCH 2/2] Update pkgs/development/interpreters/erlang/generic-builder.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- pkgs/development/interpreters/erlang/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index f78c8e937b49..4a99d9009953 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -82,7 +82,7 @@ in stdenv.mkDerivation ({ ./otp_build autoconf ''; - configureFlags = [ "--with-ssl=${opensslPackage.dev}" ] + configureFlags = [ "--with-ssl=${lib.getDev opensslPackage}" ] ++ optional enableThreads "--enable-threads" ++ optional enableSmpSupport "--enable-smp-support" ++ optional enableKernelPoll "--enable-kernel-poll"