swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix haxe to compile with ocaml 4.02

Browse source 
camlp4 is now a separate package
This commit is contained in:
Samuel Rivas 2015-07-21 17:14:28 +02:00 committed by Vincent Laporte
parent 5342e2a598
commit d1e6f055fe
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/haxe/default.nix
View file

@ -1,9 +1,9 @@
{ stdenv, fetchgit, ocaml, zlib, neko }:
{ stdenv, fetchgit, ocaml, zlib, neko, camlp4 }:
stdenv.mkDerivation {
name = "haxe-3.1.3";
buildInputs = [ocaml zlib neko];
buildInputs = [ocaml zlib neko camlp4];
src = fetchgit {
url = "https://github.com/HaxeFoundation/haxe.git";

4
pkgs/top-level/all-packages.nix
View file

@ -3972,7 +3972,9 @@ let
overrides = config.haskellPackageOverrides or (self: super: {});
};
haxe = callPackage ../development/compilers/haxe { };
haxe = callPackage ../development/compilers/haxe {
inherit (ocamlPackages) camlp4;
};
hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
hhvm = callPackage ../development/compilers/hhvm { };