From 136c0d01d25b030c0d103e989de2d5340904dc51 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 1 Jan 2021 10:48:32 +0100 Subject: [PATCH] autoconf: use buildPackages when overriding version to fix cross Like bf46afde6b22942ea605983f66ee23038986ba07 --- pkgs/top-level/all-packages.nix | 22 +++++++++++----------- pkgs/top-level/beam-packages.nix | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d57e7a6edd2a..6a9bec8247f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5222,7 +5222,7 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcoap = callPackage ../applications/networking/libcoap { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; libcryptui = callPackage ../development/libraries/libcryptui { @@ -8141,7 +8141,7 @@ in verilator = callPackage ../applications/science/electronics/verilator {}; verilog = callPackage ../applications/science/electronics/verilog { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; versus = callPackage ../applications/networking/versus { }; @@ -8251,7 +8251,7 @@ in watchman = callPackage ../development/tools/watchman { inherit (darwin.apple_sdk.frameworks) CoreServices; - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; @@ -8377,7 +8377,7 @@ in uhttpmock = callPackage ../development/libraries/uhttpmock { }; uim = callPackage ../tools/inputmethods/uim { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; uhub = callPackage ../servers/uhub { }; @@ -8572,7 +8572,7 @@ in # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; clipnotify = callPackage ../tools/misc/clipnotify { }; @@ -11119,7 +11119,7 @@ in autobuild = callPackage ../development/tools/misc/autobuild { }; - autoconf = autoconf270; + autoconf = buildPackages.autoconf270; autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; @@ -14564,7 +14564,7 @@ in libmatchbox = callPackage ../development/libraries/libmatchbox { }; libmatheval = callPackage ../development/libraries/libmatheval { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; guile = guile_2_0; }; @@ -24740,7 +24740,7 @@ in vbindiff = callPackage ../applications/editors/vbindiff { }; vcprompt = callPackage ../applications/version-management/vcprompt { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; vcs = callPackage ../applications/video/vcs { }; @@ -25207,7 +25207,7 @@ in }; x11basic = callPackage ../development/compilers/x11basic { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; x11vnc = callPackage ../tools/X11/x11vnc { }; @@ -25516,7 +25516,7 @@ in zeronet = callPackage ../applications/networking/p2p/zeronet { }; zexy = callPackage ../applications/audio/pd-plugins/zexy { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; @@ -26909,7 +26909,7 @@ in }; kallisto = callPackage ../applications/science/biology/kallisto { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; kssd = callPackage ../applications/science/biology/kssd { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 542c721e215e..52268276a033 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;