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

erlangR17: fix build on OS X

Changed files
+20 -7
pkgs
development
interpreters
erlang
top-level
+5 -3
pkgs/development/interpreters/erlang/R17.nix
···
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper
, odbcSupport ? false, unixODBC ? null
, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
, javacSupport ? false, openjdk ? null
···
buildInputs =
[ perl gnum4 ncurses openssl makeWrapper
-
] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
-
++ optional odbcSupport [ unixODBC ]
-
++ optional javacSupport [ openjdk ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
···
{ 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
···
buildInputs =
[ perl gnum4 ncurses openssl makeWrapper
+
] ++ 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 '';
+15 -4
pkgs/top-level/all-packages.nix
···
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; };
erlangR18 = callPackage ../development/interpreters/erlang/R18.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
···
erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };
erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { 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;
};