From c1cf0b7dd5fccb16c8c470d8c766a050fd7a4a36 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Sep 2014 22:38:12 +0200
Subject: [PATCH] libc++abi: Don't use fetchsvn

This prevents the Darwin stdenv from depending on Subversion.
---
 pkgs/development/libraries/libc++/default.nix |  2 +-
 .../libraries/libc++abi/default.nix           | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix
index 21a07d6f7d4..732ae08b797 100644
--- a/pkgs/development/libraries/libc++/default.nix
+++ b/pkgs/development/libraries/libc++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi, python }:
+{ stdenv, fetchurl, cmake, libcxxabi, python }:
 
 let
   version = "3.4.2";
diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix
index dd1f46a9ab3..a03caa9f571 100644
--- a/pkgs/development/libraries/libc++abi/default.nix
+++ b/pkgs/development/libraries/libc++abi/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchsvn, libcxx, libunwind }:
-let
-  rev = "199626";
-in stdenv.mkDerivation {
-  name = "libcxxabi-pre-${rev}";
+{ stdenv, fetchurl, libcxx, libunwind }:
 
-  src = fetchsvn {
-    url = http://llvm.org/svn/llvm-project/libcxxabi/trunk;
-    rev = "199626";
-    sha256 = "0h1x1s40x5r65ar53rv34lmgcfil3zxaknqr64dka1mz29xhhrxy";
+let rev = "199626"; in
+
+stdenv.mkDerivation {
+  name = "libc++abi-${rev}";
+
+  src = fetchurl {
+    url = "http://tarballs.nixos.org/libcxxabi-${rev}.tar.bz2";
+    sha256 = "09wr6qwgmdzbmgfkdzfhph9giy0zd6fp3s017fcfy4g0prjn5s4c";
   };
 
-  NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind";
+  NIX_CFLAGS_LINK = "-L${libunwind}/lib -lunwind";
 
   postUnpack = ''
     unpackFile ${libcxx.src}