mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

* Linux 2.6.21.7.

Browse source 
svn path=/nixpkgs/trunk/; revision=9176
This commit is contained in:
Eelco Dolstra 2007-08-20 14:26:32 +00:00
parent 16c6da0129
commit aa983025d6
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/linux-2.6.21.nix
View file

@ -24,7 +24,7 @@ let
lib = import ../../../lib;
version = "2.6.21.5";
version = "2.6.21.7";
in
@ -34,7 +34,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1vvfm6xhk81vvc88ibv6siqjq4a3m2204c9fkb5llasywchgyh85";
sha256 = "1c8ndsz35qd8vyng3xsxjjkjv5bnzyvc9b5vd85fz5v0bjp8hx50";
};
patches = map (p: p.patch) kernelPatches;

25
pkgs/top-level/all-packages.nix
View file

@ -176,17 +176,15 @@ rec {
allPackages = import ./all-packages.nix;
}).stdenv;
stdenv = if (bootStdenv == null) then
let
optionPath = ["replaceStdenv"]; in
let
changer = getConfig optionPath null; in
(if changer != null then
changer {stdenv = defaultStdenv;
overrideSetup = overrideSetup;}
else defaultStdenv)
else
bootStdenv;
stdenv =
if bootStdenv != null then bootStdenv else
let changer = getConfig ["replaceStdenv"] null;
in if changer != null then
changer {
stdenv = defaultStdenv;
overrideSetup = overrideSetup;
}
else defaultStdenv;
### BUILD SUPPORT
@ -3012,7 +3010,7 @@ rec {
inherit (xlibs) libX11;
};
eclipse = plugins :
eclipse = plugins:
import ../applications/editors/eclipse {
inherit fetchurl stdenv makeWrapper jdk;
inherit (gtkLibs) gtk glib;
@ -3024,8 +3022,7 @@ rec {
eclipseSpoofax = lowPrio (appendToName "with-spoofax" (eclipse [spoofax]));
elinks = (import ../applications/networking/browsers/elinks)
{
elinks = import ../applications/networking/browsers/elinks {
inherit stdenv fetchurl python perl ncurses x11 zlib openssl;
};