From d1e6f055fe01e3e13a6ba603dd815da2a4d991c8 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Tue, 21 Jul 2015 17:14:28 +0200
Subject: [PATCH] Fix haxe to compile with ocaml 4.02

camlp4 is now a separate package
---
 pkgs/development/compilers/haxe/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index d9c9f91df6a..41c7a476b27 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85035583af9..81700f14669 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };