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

autoconf: use buildPackages when overriding version

Browse Source 
to fix cross

Like bf46afde6b
This commit is contained in:
Frederik Rietdijk
2021-01-01 10:50:13 +01:00
parent 8500f595a1
commit 136c0d01d2
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/beam-packages.nix
+8 -8
View File
@@ -1,4 +1,4 @@
{ callPackage, wxGTK30, openssl_1_0_2, autoconf269 }:
{ callPackage, wxGTK30, openssl_1_0_2, buildPackages }:
rec {
lib = callPackage ../development/beam-modules/lib.nix {};
@@ -20,7 +20,7 @@ rec {
wxGTK = wxGTK30;
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
parallelBuild = true;
autoconf = autoconf269;
autoconf = buildPackages.autoconf269;
};
erlangR23_odbc = erlangR23.override { odbcSupport = true; };
erlangR23_javac = erlangR23.override { javacSupport = true; };
@@ -34,7 +34,7 @@ rec {
wxGTK = wxGTK30;
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
parallelBuild = true;
autoconf = autoconf269;
autoconf = buildPackages.autoconf269;
};
erlangR22_odbc = erlangR22.override { odbcSupport = true; };
erlangR22_javac = erlangR22.override { javacSupport = true; };
@@ -46,7 +46,7 @@ rec {
# R21
erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix {
wxGTK = wxGTK30;
autoconf = autoconf269;
autoconf = buildPackages.autoconf269;
};
erlangR21_odbc = erlangR21.override { odbcSupport = true; };
erlangR21_javac = erlangR21.override { javacSupport = true; };
@@ -58,7 +58,7 @@ rec {
# R20
erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {
wxGTK = wxGTK30;
autoconf = autoconf269;
autoconf = buildPackages.autoconf269;
};
erlangR20_odbc = erlangR20.override { odbcSupport = true; };
erlangR20_javac = erlangR20.override { javacSupport = true; };
@@ -71,7 +71,7 @@ rec {
erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {
wxGTK = wxGTK30;
openssl = openssl_1_0_2;
autoconf = autoconf269;
autoconf = buildPackages.autoconf269;
};
erlangR19_odbc = erlangR19.override { odbcSupport = true; };
erlangR19_javac = erlangR19.override { javacSupport = true; };
@@ -84,7 +84,7 @@ rec {
erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
wxGTK = wxGTK30;
openssl = openssl_1_0_2;
autoconf = autoconf269;
autoconf = buildPackages.autoconf269;
};
erlangR18_odbc = erlangR18.override { odbcSupport = true; };
erlangR18_javac = erlangR18.override { javacSupport = true; };
@@ -95,7 +95,7 @@ rec {
# Basho fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
autoconf = autoconf269;
autoconf = buildPackages.autoconf269;
};
erlang_basho_R16B02_odbc = erlang_basho_R16B02.override {
odbcSupport = true;