From 8a59e608aa8feb4d2cbaebfe95e048f9c5f42350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 1 Sep 2010 09:49:53 +0000
Subject: [PATCH] Setting the new binutils snapshot niksnut copied to
 nixos.org, for the time while they don't release.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23587
---
 pkgs/development/tools/misc/binutils/snapshot.nix | 4 ++--
 pkgs/top-level/all-packages.nix                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/snapshot.nix b/pkgs/development/tools/misc/binutils/snapshot.nix
index 2563f998265..24b70dd2492 100644
--- a/pkgs/development/tools/misc/binutils/snapshot.nix
+++ b/pkgs/development/tools/misc/binutils/snapshot.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
   name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
 
   src = fetchurl {
-    url = "file:///root/binutils/${basename}.tar.bz2";
-    sha256 = "1f0na8c31sccbipzk8xiyd7n7ydh5gg09kirbs28vcb2714cxws0";
+    url = http://nixos.org/tarballs/binutils-2.20.51-pre-20100901.tar.bz2;
+    sha256 = "1872fdnbnq5z5svq7mvc0vyyad8pknwvx2glxq1bbk0xv7arp72y";
   };
 
   patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40f9dcd5dac..209a33c377a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2267,8 +2267,8 @@ let
     inherit noSysDirs;
   };
 
-  binutils = if stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then binutils_snapshot
-    else binutils_release;
+  # We are waiting for a release. Meanwhile, sysvinit and the loongson2f need it.
+  binutils = binutils_snapshot;
 
   binutilsCross = forceBuildDrv (import ../development/tools/misc/binutils {
       inherit stdenv fetchurl;