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

* useDietLibC: work properly on impure stdenvs. 

* dietlibc: pass glibc explicitly.

svn path=/nixpkgs/trunk/; revision=6807
This commit is contained in:
Eelco Dolstra 2006-10-23 17:43:55 +00:00
parent 13c3591485
commit 461783c3a5
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/dietlibc/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl}: {stdenv, fetchurl, glibc}:
assert stdenv.system == "i686-linux"; assert stdenv.isLinux;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dietlibc-0.30"; name = "dietlibc-0.30";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
md5 = "2465d652fff6f1fad3da3b98e60e83c9"; md5 = "2465d652fff6f1fad3da3b98e60e83c9";
}; };
builder = ./builder.sh; builder = ./builder.sh;
inherit (stdenv) glibc; inherit glibc;
patches = [ patches = [

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

@ -94,10 +94,9 @@ rec {
+ " --disable-shared"; # brrr... + " --disable-shared"; # brrr...
NIX_GCC = import ../build-support/gcc-wrapper { NIX_GCC = import ../build-support/gcc-wrapper {
inherit stdenv binutils; inherit stdenv;
gcc = gcc.gcc;
glibc = dietlibc; glibc = dietlibc;
nativeTools = false; inherit (gcc) gcc binutils name nativeTools nativePrefix;
nativeGlibc = false; nativeGlibc = false;
}; };
}); });
@ -2034,7 +2033,7 @@ rec {
#}; #};
dietlibc = import ../os-specific/linux/dietlibc { dietlibc = import ../os-specific/linux/dietlibc {
inherit fetchurl stdenv; inherit fetchurl stdenv glibc;
}; };
#dietlibcArm = import ../os-specific/linux/dietlibc-cross { #dietlibcArm = import ../os-specific/linux/dietlibc-cross {