about summary refs log tree commit diff
path: root/pkgs/top-level/beam-packages.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2021-01-01 10:48:32 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2021-01-01 10:50:13 +0100
commit136c0d01d25b030c0d103e989de2d5340904dc51 (patch)
tree9b589edaaf3f60e4e8a5920bee13404387d5429f /pkgs/top-level/beam-packages.nix
parent8500f595a18fefbc3791aeb9709750e5f6775030 (diff)
autoconf: use buildPackages when overriding version
to fix cross

Like bf46afde6b22942ea605983f66ee23038986ba07
Diffstat (limited to 'pkgs/top-level/beam-packages.nix')
-rw-r--r--pkgs/top-level/beam-packages.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 542c721e215ef..52268276a0336 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -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;