stage: remove nixpkgsFun
also inherit forceSystem for some GNU Hurd stuff
This commit is contained in:
parent
d1bd9faf61
commit
18af089de7
@ -5,13 +5,14 @@
|
||||
* to merges. Please use the full-text search of your editor. ;)
|
||||
* Hint: ### starts category names.
|
||||
*/
|
||||
{ lib, nixpkgsFun, noSysDirs, config}:
|
||||
{ lib, noSysDirs, config}:
|
||||
self: pkgs:
|
||||
|
||||
with pkgs;
|
||||
|
||||
{
|
||||
|
||||
# Allow callPackage to fill in the pkgs argument
|
||||
inherit pkgs;
|
||||
|
||||
# A stdenv capable of building 32-bit binaries. On x86_64-linux,
|
||||
@ -2404,7 +2405,7 @@ with pkgs;
|
||||
fluentd = callPackage ../tools/misc/fluentd { };
|
||||
|
||||
flvstreamer = callPackage ../tools/networking/flvstreamer { };
|
||||
|
||||
|
||||
hmetis = callPackage_i686 ../applications/science/math/hmetis { };
|
||||
|
||||
libbsd = callPackage ../development/libraries/libbsd { };
|
||||
@ -3703,7 +3704,7 @@ with pkgs;
|
||||
lzip = callPackage ../tools/compression/lzip { };
|
||||
|
||||
luxcorerender = callPackage ../tools/graphics/luxcorerender { };
|
||||
|
||||
|
||||
xz = callPackage ../tools/compression/xz { };
|
||||
|
||||
lz4 = callPackage ../tools/compression/lz4 { };
|
||||
@ -4968,7 +4969,7 @@ with pkgs;
|
||||
securefs = callPackage ../tools/filesystems/securefs { };
|
||||
|
||||
seexpr = callPackage ../development/compilers/seexpr { };
|
||||
|
||||
|
||||
setroot = callPackage ../tools/X11/setroot { };
|
||||
|
||||
setserial = callPackage ../tools/system/setserial { };
|
||||
@ -5873,14 +5874,7 @@ with pkgs;
|
||||
xbursttools = callPackage ../tools/misc/xburst-tools {
|
||||
# It needs a cross compiler for mipsel to build the firmware it will
|
||||
# load into the Ben Nanonote
|
||||
gccCross =
|
||||
let
|
||||
pkgsCross = nixpkgsFun {
|
||||
# Ben Nanonote system
|
||||
crossSystem = lib.systems.examples.ben-nanonote;
|
||||
};
|
||||
in
|
||||
pkgsCross.buildPackages.gccCrossStageStatic;
|
||||
gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic;
|
||||
};
|
||||
|
||||
xclip = callPackage ../tools/misc/xclip { };
|
||||
|
@ -93,7 +93,7 @@ let
|
||||
|
||||
allPackages = self: super:
|
||||
let res = import ./all-packages.nix
|
||||
{ inherit lib nixpkgsFun noSysDirs config; }
|
||||
{ inherit lib noSysDirs config; }
|
||||
res self;
|
||||
in res;
|
||||
|
||||
@ -138,10 +138,8 @@ let
|
||||
|
||||
# Used by wine, firefox with debugging version of Flash, ...
|
||||
pkgsi686Linux = forceSystem "i686-linux" "i386";
|
||||
|
||||
callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
|
||||
then self.pkgsi686Linux.callPackage
|
||||
else throw "callPackage_i686 not supported on system '${stdenv.system}'";
|
||||
callPackage_i686 = self.pkgsi686Linux.callPackage;
|
||||
inherit forceSystem;
|
||||
};
|
||||
|
||||
# The complete chain of package set builders, applied from top to bottom.
|
||||
|
Loading…
Reference in New Issue
Block a user