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

libc++abi: Don't use fetchsvn

Browse Source 
This prevents the Darwin stdenv from depending on Subversion.
This commit is contained in:
Eelco Dolstra 2014-09-18 22:38:12 +02:00
parent 91ec6e0d90
commit c1cf0b7dd5
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libc++/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi, python }: { stdenv, fetchurl, cmake, libcxxabi, python }:
let let
version = "3.4.2"; version = "3.4.2";

20
pkgs/development/libraries/libc++abi/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchsvn, libcxx, libunwind }: { stdenv, fetchurl, libcxx, libunwind }:
let
rev = "199626";
in stdenv.mkDerivation {
name = "libcxxabi-pre-${rev}";
src = fetchsvn { let rev = "199626"; in
url = http://llvm.org/svn/llvm-project/libcxxabi/trunk;
rev = "199626"; stdenv.mkDerivation {
sha256 = "0h1x1s40x5r65ar53rv34lmgcfil3zxaknqr64dka1mz29xhhrxy"; 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 = '' postUnpack = ''
unpackFile ${libcxx.src} unpackFile ${libcxx.src}