From a0716f28afd5b3f9028f40ea17d8b0a9097fcff8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 26 Mar 2013 19:56:09 +0100 Subject: [PATCH] haxe: Use ignoreExternals and fix build. Now, our builds shouldn't break anymore once there is a new change in ocamllibs. I've used revision 256 from ocamllibs, because this was approximately the revision we had back then when Haxe 2.10 got released. Signed-off-by: aszlig --- pkgs/development/compilers/haxe/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 817e4573df24..1b4f237cca5b 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -5,12 +5,22 @@ stdenv.mkDerivation { buildInputs = [ocaml zlib neko]; - src = fetchsvn { + srcs = fetchsvn { url = "http://haxe.googlecode.com/svn/tags/v2-10"; - sha256 = "dbd3c655e4136eb68a165ef83b96bfc1f0f2eb9ec8729603b19bcd717a61a679"; + sha256 = "0vwdlj0vmmf97bg6cish7yah36aca2q599vwzbr1m0jpjbvindkh"; + ignoreExternals = true; + }; + + ocamllibs = fetchsvn { + url = "http://ocamllibs.googlecode.com/svn/trunk"; + sha256 = "143s320xn2xalm0lnw46h1fvy48qg7my3j8cf66f0wwzv2fisr1q"; + rev = 256; + 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 '';