erlang: use wxmac on darwin
This commit is contained in:
parent
8a07499620
commit
b66942702b
@ -1,11 +1,15 @@
|
|||||||
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
|
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
|
||||||
, gnused, gawk, makeWrapper
|
, gnused, gawk, makeWrapper
|
||||||
, odbcSupport ? false, unixODBC ? null
|
, odbcSupport ? false, unixODBC ? null
|
||||||
, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null
|
, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null
|
||||||
, javacSupport ? false, openjdk ? null
|
, javacSupport ? false, openjdk ? null
|
||||||
, enableHipe ? true}:
|
, enableHipe ? true
|
||||||
|
}:
|
||||||
|
|
||||||
|
assert wxSupport -> (if stdenv.isDarwin
|
||||||
|
then wxmac != null
|
||||||
|
else mesa != null && wxGTK != null && xlibs != null);
|
||||||
|
|
||||||
assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
|
|
||||||
assert odbcSupport -> unixODBC != null;
|
assert odbcSupport -> unixODBC != null;
|
||||||
assert javacSupport -> openjdk != null;
|
assert javacSupport -> openjdk != null;
|
||||||
|
|
||||||
@ -23,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ perl gnum4 ncurses openssl makeWrapper
|
[ perl gnum4 ncurses openssl makeWrapper
|
||||||
] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]
|
] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ])
|
||||||
++ optional odbcSupport [ unixODBC ]
|
++ optional odbcSupport [ unixODBC ]
|
||||||
++ optional javacSupport [ openjdk ];
|
++ optional javacSupport [ openjdk ];
|
||||||
|
|
||||||
@ -34,7 +38,13 @@ stdenv.mkDerivation rec {
|
|||||||
sed -e s@/bin/pwd@pwd@g -i otp_build
|
sed -e s@/bin/pwd@pwd@g -i otp_build
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags= "--with-ssl=${openssl} ${optionalString enableHipe "--enable-hipe"} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"} ${optionalString javacSupport "--with-javac"}";
|
configureFlags= [
|
||||||
|
"--with-ssl=${openssl}"
|
||||||
|
] ++ optional enableHipe "--enable-hipe"
|
||||||
|
++ optional wxSupport "--enable-wx"
|
||||||
|
++ optional odbcSupport "--with-odbc=${unixODBC}"
|
||||||
|
++ optional javacSupport "--with-javac"
|
||||||
|
++ optional stdenv.isDarwin "--enable-darwin-64bit";
|
||||||
|
|
||||||
postInstall = let
|
postInstall = let
|
||||||
manpages = fetchurl {
|
manpages = fetchurl {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user