diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2016-08-24 11:52:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 11:52:27 +0200 |
| commit | 3f337a2b23eab043fbea3b15796e7002dfa96751 (patch) | |
| tree | adabe4dd64a11aedae79bb6e888347ee38a8487a /pkgs/development/interpreters/erlang | |
| parent | 76223aa4b2cc7ebda27a93f00829bd447701740a (diff) | |
| parent | a6faa04ee45f1466335cfeb28cfa1b897e31a9b7 (diff) | |
| download | nixlib-3f337a2b23eab043fbea3b15796e7002dfa96751.tar nixlib-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.gz nixlib-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.bz2 nixlib-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.lz nixlib-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.xz nixlib-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.zst nixlib-3f337a2b23eab043fbea3b15796e7002dfa96751.zip | |
Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
Diffstat (limited to 'pkgs/development/interpreters/erlang')
| -rw-r--r-- | pkgs/development/interpreters/erlang/R16.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index ffc4c27e6629..02f9d1f98e81 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -2,7 +2,8 @@ , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null -, enableDebugInfo ? false }: +, enableDebugInfo ? false +, Carbon ? null, Cocoa ? null }: assert wxSupport -> mesa != null && wxGTK != null && xorg != null; assert odbcSupport -> unixODBC != null; @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport [ unixODBC ]; + ++ optional odbcSupport [ unixODBC ] + ++ optional stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; |