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

Remove all-packages.nix helperFunctions dependency.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-20 16:41:20 +00:00
parent ae0471b737
commit 5cdaa7b907
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/dotnetbuildhelpers/default.nix
View File

@ -1,5 +1,5 @@
{ helperFunctions, mono, pkgconfig }: { runCommand, mono, pkgconfig }:
helperFunctions.runCommand runCommand
"dotnetbuildhelpers" "dotnetbuildhelpers"
{ preferLocalBuild = true; } { preferLocalBuild = true; }
'' ''

6
pkgs/top-level/all-packages.nix
View File

@ -1,6 +1,6 @@
{ system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling { system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling
, config, crossSystem, platform, lib , config, crossSystem, platform, lib
, pkgsWithOverrides, stdenvAdapters, helperFunctions , pkgsWithOverrides, stdenvAdapters
, ... }: , ... }:
self: pkgs: self: pkgs:
@ -151,9 +151,7 @@ in
dotnetfx = dotnetfx40; dotnetfx = dotnetfx40;
}; };
dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { };
inherit helperFunctions;
};
dispad = callPackage ../tools/X11/dispad { }; dispad = callPackage ../tools/X11/dispad { };

2
pkgs/top-level/default.nix
View File

@ -123,7 +123,7 @@ let
stdenvDefault = (import ./stdenv.nix topLevelArguments) {} pkgs; 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; self = (import ./all-packages.nix selfArgs) self pkgs;
aliases = import ./aliases.nix self; aliases = import ./aliases.nix self;