diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-03 17:56:55 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-03 17:56:55 +0000 |
| commit | 801dc3576481983e1a6db2f16d7ec0672523a20e (patch) | |
| tree | e479cb5a8a722813d726cff2582f010e1644b86d /pkgs/top-level | |
| parent | 4b122bab889944d7d0a03331c322a7ebdbba64d9 (diff) | |
| download | nixlib-801dc3576481983e1a6db2f16d7ec0672523a20e.tar nixlib-801dc3576481983e1a6db2f16d7ec0672523a20e.tar.gz nixlib-801dc3576481983e1a6db2f16d7ec0672523a20e.tar.bz2 nixlib-801dc3576481983e1a6db2f16d7ec0672523a20e.tar.lz nixlib-801dc3576481983e1a6db2f16d7ec0672523a20e.tar.xz nixlib-801dc3576481983e1a6db2f16d7ec0672523a20e.tar.zst nixlib-801dc3576481983e1a6db2f16d7ec0672523a20e.zip | |
* Export the stdenv adapter functions.
* Add a "kernel" attribute containing the default kernel to make it easier to override. svn path=/nixpkgs/trunk/; revision=19189
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca0d8fe83cbe..e03733c91ca3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -77,9 +77,12 @@ let # Helper functions that are exported through `pkgs'. helperFunctions = - (import ../stdenv/adapters.nix { inherit (pkgs) dietlibc fetchurl runCommand; }) // + stdenvAdapters // (import ../build-support/trivial-builders.nix { inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); + stdenvAdapters = + import ../stdenv/adapters.nix { inherit (pkgs) dietlibc fetchurl runCommand; }; + # Allow packages to be overriden globally via the `packageOverrides' # configuration option, which must be a function that takes `pkgs' @@ -123,7 +126,7 @@ let ### Helper functions. - inherit lib config getConfig; + inherit lib config getConfig stdenvAdapters; inherit (lib) lowPrio appendToName makeOverridable; @@ -5610,7 +5613,8 @@ let kernelPackages_2_6_32 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_32); # The current default kernel / kernel modules. - kernelPackages = kernelPackages_2_6_28; + kernel = kernel_2_6_28; + kernelPackages = kernelPackagesFor kernel; customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/generic.nix) { inherit fetchurl stdenv perl mktemp module_init_tools; |