b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #112989 from happysalada/allow_erlang_openssl_override

Browse source
This commit is contained in:
Jörg Thalheim 2021-02-17 08:21:29 +00:00 committed by GitHub
parent 6e2a2df3ab fb0c10bbdb
commit 76cb8066f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/interpreters/erlang/generic-builder.nix
View file

@ -19,6 +19,7 @@
, javacSupport ? false, javacPackages ? [ openjdk11 ]
, 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 ? ""
@ -51,7 +52,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
@ -80,7 +81,7 @@ in stdenv.mkDerivation ({
./otp_build autoconf
'';
configureFlags = [ "--with-ssl=${openssl.dev}" ]
configureFlags = [ "--with-ssl=${lib.getDev opensslPackage}" ]
++ optional enableThreads "--enable-threads"
++ optional enableSmpSupport "--enable-smp-support"
++ optional enableKernelPoll "--enable-kernel-poll"