ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-05 09:58:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21600 from mdaiter/wxGTKErlangLink

Browse Source 
erlang: explicitly link appropriate wxGTK versions for R18/R19
This commit is contained in:
Daiderd Jordan 2017-01-04 00:44:19 +01:00 committed by GitHub
commit 708bdd229a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5512,32 +5512,40 @@ in
};
erlangR18 = callPackage ../development/interpreters/erlang/R18.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
wxGTK = wxGTK30;
};
erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
wxGTK = wxGTK30;
odbcSupport = true;
};
erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
wxGTK = wxGTK30;
javacSupport = true;
};
erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
wxGTK = wxGTK30;
javacSupport = true; odbcSupport = true;
};
erlangR19 = callPackage ../development/interpreters/erlang/R19.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
wxGTK = wxGTK30;
};
erlangR19_odbc = callPackage ../development/interpreters/erlang/R19.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
wxGTK = wxGTK30;
odbcSupport = true;
};
erlangR19_javac = callPackage ../development/interpreters/erlang/R19.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
javacSupport = true;
wxGTK = wxGTK30;
javacSupport = true;
};
erlangR19_odbc_javac = callPackage ../development/interpreters/erlang/R19.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
wxGTK = wxGTK30;
javacSupport = true; odbcSupport = true;
};
erlang = erlangR18;