Reverting the patch that disabled using the 'binutils snapshot', because it's

needed for the fuloong minipc. It was not enough having the loongson2f patches;
only having the patches, we got troubles building cups with a segfault on the
dynamic loader running their 'genstrings' program.  And if sysvinit needs newer
binutils (I can't remember why, but I wrote it in the all-packages.nix before),
then let's use the snapshot.

As a note about "why this snapshot" (civodul was interested), when I knew that
we needed an unreleased version of binutils I went to download the snapshot of
the day. And it worked. This is all the story.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24229
This commit is contained in:
Lluís Batlle i Rossell
2010-10-11 23:18:00 +00:00
parent 427d99ee1e
commit 18372e5a56
5 changed files with 69 additions and 514 deletions
@@ -2,13 +2,9 @@
let
basename = "binutils-2.20.1";
targetIsMips = stdenv.system == "mips64-linux" || (cross != null && cross.arch == "mips");
in
stdenv.mkDerivation rec {
# In the case of targetIsMips we apply a version-bump patch
name = (if targetIsMips then "binutils-2.20.51" else
basename) + stdenv.lib.optionalString (cross != null) "-${cross.config}";
name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
src = fetchurl {
url = "mirror://gnu/binutils/${basename}.tar.bz2";
@@ -20,11 +16,7 @@ stdenv.mkDerivation rec {
# RUNPATH instead of RPATH on binaries. This is important because
# RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
./new-dtags.patch
]
# For loongson2f (the only mips running nixos now) we need these patches for
# linux to build. It checks the binutils version, so we have even to udpate the
# version.
++ stdenv.lib.optionals targetIsMips [ ./loongson2f.patch ./version-bump.patch ];
];
inherit noSysDirs;