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

Fixing a stdenv problem... 'binutils' where linked with zlib from

Browse Source 
bootstrap-tools, because zlib was there and binutils were not having an
explicit buildInput for zlib. Due to that, we ended up with stdenv
(gcc-wrapper) depending on bootstrap-tools as runtime dependency.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24790
This commit is contained in:
Lluís Batlle i Rossell 2010-11-21 14:29:20 +00:00
parent ea00506f53
commit c1620ef552
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/binutils/snapshot.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, noSysDirs, cross ? null}: {stdenv, fetchurl, noSysDirs, zlib, cross ? null}:
let let
basename = "binutils-2.20.51"; basename = "binutils-2.20.51";
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
./new-dtags.patch ./new-dtags.patch
]; ];
buildInputs = [ zlib ];
inherit noSysDirs; inherit noSysDirs;
preConfigure = '' preConfigure = ''

4
pkgs/stdenv/linux/default.nix
View File

@ -191,7 +191,7 @@ rec {
# 6) Construct a third stdenv identical to the 2nd, except that # 6) Construct a third stdenv identical to the 2nd, except that
# this one uses the Glibc built in step 3. It still uses # this one uses the Glibc built in step 3. It still uses
# the recent binutils and rest of the bootstrap tools, including GCC. # the recent binutils and rest of the bootstrap tools, including GCC.
stdenvLinuxBoot3 = removeAttrs (stdenvBootFun { stdenvLinuxBoot3 = stdenvBootFun {
gcc = wrapGCC { gcc = wrapGCC {
binutils = stdenvLinuxBoot1Pkgs.binutils; binutils = stdenvLinuxBoot1Pkgs.binutils;
coreutils = bootstrapTools; coreutils = bootstrapTools;
@ -202,7 +202,7 @@ rec {
inherit (stdenvLinuxBoot1Pkgs) perl; inherit (stdenvLinuxBoot1Pkgs) perl;
}; };
inherit fetchurl; inherit fetchurl;
}) ["gcc" "binutils"]; };
# 7) The packages that can be built using the third stdenv. # 7) The packages that can be built using the third stdenv.