Merge pull request #17685 from matthewbauer/darwin-misc2

Darwin misc. fixes
This commit is contained in:
Daniel Peebles
2016-08-24 11:52:27 +02:00
committed by GitHub
44 changed files with 162 additions and 49 deletions

View File

@@ -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 '';