diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
| commit | 2d382f3d981fc9e4a350badb43736c252415d27c (patch) | |
| tree | 3d5f7a96aa71be52c86f3c243b23424e319cc286 /pkgs/development/interpreters/erlang | |
| parent | 365379857fb561df949fc841e80458e317a1d682 (diff) | |
| parent | 2661511cdb39bd7612dd5311b46420785fc1eac8 (diff) | |
| download | nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.gz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.bz2 nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.lz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.xz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.zst nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/interpreters/erlang')
| -rw-r--r-- | pkgs/development/interpreters/erlang/R16.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/erlang/R17.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/erlang/R18.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 7ae7af30717c..6eb89bbf89be 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; + configureFlags= "--with-ssl=${openssl.dev} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; postInstall = let manpages = fetchurl { diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index b32e3af9865e..c597a44a890e 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; configureFlags= [ - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 2fc91d6a2dbe..42289d2467b1 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; configureFlags= [ - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" |