haxe: 3.2.1 -> 3.4.2

This commit is contained in:
Andy Li
2017-05-06 00:41:43 +08:00
parent 587ed894a4
commit 56b30bf98a
2 changed files with 8 additions and 138 deletions
+8 -10
View File
@@ -1,25 +1,23 @@
{ stdenv, fetchgit, ocaml, zlib, neko, camlp4 }:
{ stdenv, fetchgit, ocaml, zlib, pcre, neko, camlp4 }:
stdenv.mkDerivation {
name = "haxe-3.2.1";
name = "haxe-3.4.2";
buildInputs = [ocaml zlib neko camlp4];
buildInputs = [ocaml zlib pcre neko camlp4];
src = fetchgit {
url = "https://github.com/HaxeFoundation/haxe.git";
sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3";
sha256 = "1m5fp183agqv8h3ynhxw4kndkpq2d6arysmirv3zl3vz5crmpwqd";
fetchSubmodules = true;
# Tag 3.2.1
rev = "deab4424399b520750671e51e5f5c2684e942c17";
# Tag 3.4.2
rev = "890f8c70cf23ce6f9fe0fdd0ee514a9699433ca7";
};
prePatch = ''
sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml
sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml
'';
patches = [ ./haxelib-nix.patch ];
buildFlags = [ "all" "tools" ];
installPhase = ''
@@ -34,7 +32,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
homepage = http://haxe.org;
homepage = https://haxe.org;
license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt
maintainers = [ maintainers.marcweber ];
platforms = platforms.linux ++ platforms.darwin;