From b65e5d8c9674ca7ee0677e5f646fb9857e8e69f5 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Tue, 3 Jan 2017 01:31:48 +0100 Subject: [PATCH] erlang: explicitly link appropriate wxGTK versions for R18/R19 --- pkgs/top-level/all-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5773c94bdb..0ddd03b729a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5488,32 +5488,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;