diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnetbuildhelpers/default.nix index ed0d4f790c81..0edfd0b467ab 100644 --- a/pkgs/build-support/dotnetbuildhelpers/default.nix +++ b/pkgs/build-support/dotnetbuildhelpers/default.nix @@ -1,5 +1,5 @@ -{ helperFunctions, mono, pkgconfig }: - helperFunctions.runCommand +{ runCommand, mono, pkgconfig }: + runCommand "dotnetbuildhelpers" { preferLocalBuild = true; } '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18fc8b958113..e8b659586c21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1,6 +1,6 @@ { system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling , config, crossSystem, platform, lib -, pkgsWithOverrides, stdenvAdapters, helperFunctions +, pkgsWithOverrides, stdenvAdapters , ... }: self: pkgs: @@ -151,9 +151,7 @@ in dotnetfx = dotnetfx40; }; - dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { - inherit helperFunctions; - }; + dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { }; dispad = callPackage ../tools/X11/dispad { }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index acce228ddfff..8b499b96215d 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -123,7 +123,7 @@ let stdenvDefault = (import ./stdenv.nix topLevelArguments) {} pkgs; - selfArgs = topLevelArguments // { inherit pkgsWithOverrides stdenvAdapters helperFunctions; }; + selfArgs = topLevelArguments // { inherit pkgsWithOverrides stdenvAdapters; }; self = (import ./all-packages.nix selfArgs) self pkgs; aliases = import ./aliases.nix self;