mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-24 03:43:53 +03:00
Revert "haxe: Use ignoreExternals and fix build."
This reverts commit a0716f28af
.
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
This commit is contained in:
parent
565b5b522f
commit
b59d53cc2d
@ -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
|
||||
'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user