diff options
| author | Eric Bailey <eric@ericb.me> | 2016-03-21 19:19:32 -0500 |
|---|---|---|
| committer | Eric Bailey <eric@ericb.me> | 2016-04-01 19:06:20 -0500 |
| commit | 456ce674623e186ca026356635b3711c89e227d6 (patch) | |
| tree | 5269e219c7f4853dd33ab82a0f084b631a64c983 | |
| parent | 6a4ca7e43a54fccc6ecbb0f195e5123098fc4976 (diff) | |
| download | nixlib-456ce674623e186ca026356635b3711c89e227d6.tar nixlib-456ce674623e186ca026356635b3711c89e227d6.tar.gz nixlib-456ce674623e186ca026356635b3711c89e227d6.tar.bz2 nixlib-456ce674623e186ca026356635b3711c89e227d6.tar.lz nixlib-456ce674623e186ca026356635b3711c89e227d6.tar.xz nixlib-456ce674623e186ca026356635b3711c89e227d6.tar.zst nixlib-456ce674623e186ca026356635b3711c89e227d6.zip | |
Patch erlang-R17
Fix R17 build on OS X, modeling changes after R18, i.e. inherit Carbon, Cocoa.
| -rw-r--r-- | pkgs/development/interpreters/erlang/R17.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 19 |
2 files changed, 20 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index e06b2741d35c..8096ca555a44 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f583ac5cdec..d75963e066aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5231,10 +5231,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; }; |