From 2a73de6e6c7899e34b8cd8f3a625e7c18d3ead33 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:44:32 +0300 Subject: treewide: Make explicit that 'dev' output of openssl is used --- pkgs/development/interpreters/erlang/R16.nix | 2 +- pkgs/development/interpreters/erlang/R17.nix | 2 +- pkgs/development/interpreters/erlang/R18.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/interpreters/erlang') 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}" -- cgit 1.4.1