diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-04-29 01:12:13 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-04-29 22:06:53 +0200 |
| commit | ab53d469f82c9b8998d52e7987576cb967ea443b (patch) | |
| tree | 166383d3a05c804936d7eb00331c64fcd02f87a4 /pkgs/development/interpreters | |
| parent | fe4bc3cc80bb20125726707b712991dca9c70c03 (diff) | |
| download | nixlib-ab53d469f82c9b8998d52e7987576cb967ea443b.tar nixlib-ab53d469f82c9b8998d52e7987576cb967ea443b.tar.gz nixlib-ab53d469f82c9b8998d52e7987576cb967ea443b.tar.bz2 nixlib-ab53d469f82c9b8998d52e7987576cb967ea443b.tar.lz nixlib-ab53d469f82c9b8998d52e7987576cb967ea443b.tar.xz nixlib-ab53d469f82c9b8998d52e7987576cb967ea443b.tar.zst nixlib-ab53d469f82c9b8998d52e7987576cb967ea443b.zip | |
erlang: enable and fix builds on darwin
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/erlang/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix index 077eaa9093b0..7dc71ed65461 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -4,6 +4,8 @@ assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; +with stdenv.lib; + stdenv.mkDerivation rec { name = "erlang-" + version; version = "R16B02"; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; + ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags = "--with-ssl=${openssl}"; + configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; postInstall = '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call @@ -49,9 +51,9 @@ stdenv.mkDerivation rec { tolerance. ''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.unix; # Note: Maintainer of prev. erlang version was simons. If he wants # to continue maintaining erlang I'm totally ok with that. - maintainers = [ stdenv.lib.maintainers.the-kenny ]; + maintainers = [ maintainers.the-kenny ]; }; } |