From b59d53cc2de17bd6185773d2eaeb4e176699c32a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 25 May 2013 18:44:15 +0200
Subject: Revert "haxe: Use ignoreExternals and fix build."

This reverts commit a0716f28afd5b3f9028f40ea17d8b0a9097fcff8.

Starting with r6706, externals now have a fixed revision, so we no longer need
to ignore them.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

Conflicts:
	pkgs/development/compilers/haxe/default.nix
---
 pkgs/development/compilers/haxe/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'pkgs/development/compilers/haxe')

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index b36caaf04a08..b2d69f2ea7d7 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -5,23 +5,13 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml zlib neko];
 
-  srcs = fetchsvn {
+  src = fetchsvn {
     url = "http://haxe.googlecode.com/svn/trunk";
-    sha256 = "0yfqqyr2jyd9b15xadcvv3fiaipxzgnilqnbbgd6pnaj1zsm31lr";
+    sha256 = "0hg8qailhgrcdk7r4k9kmwfl9d9ds0vy0l7wbv5wdrrc34qzifm4";
     rev = 6706;
-    ignoreExternals = true;
-  };
-
-  ocamllibs = fetchsvn {
-    url = "http://ocamllibs.googlecode.com/svn/trunk";
-    sha256 = "0ngcsp1qksz98r3qixj1b3l2k9qp7wgn7jxc2fpl8pvv9bc3b52f";
-    rev = 287;
-    ignoreExternals = true;
   };
 
   prePatch = ''
-    cp -r "$ocamllibs" libs
-    chmod -R u+w libs
     sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml
   '';
 
-- 
cgit 1.4.1