JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14385 from yurrriq/patch-erlang-R17

Browse Source 
erlangR17: fix build on OS X
This commit is contained in:
Domen Kožar 2016-04-02 14:20:19 +01:00
commit 3e23865bbe
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/erlang/R17.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper
, Carbon, Cocoa
, odbcSupport ? false, unixODBC ? null
, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
, javacSupport ? false, openjdk ? null
@ -27,9 +28,10 @@ stdenv.mkDerivation rec {
buildInputs =
[ perl gnum4 ncurses openssl makeWrapper
] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
++ optional odbcSupport [ unixODBC ]
++ optional javacSupport [ openjdk ];
] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
++ optional odbcSupport unixODBC
++ optional javacSupport openjdk
++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';

19
pkgs/top-level/all-packages.nix
View File

@ -5233,10 +5233,21 @@ in
erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };
erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; };
erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };
erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; };
erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; };
erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; };
erlangR17 = callPackage ../development/interpreters/erlang/R17.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
odbcSupport = true;
};
erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
javacSupport = true;
};
erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
javacSupport = true; odbcSupport = true;
};
erlangR18 = callPackage ../development/interpreters/erlang/R18.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};