From 5de04f6d5584ee8f372319636a7397539daad0e5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 9 Feb 2017 09:14:51 +0100 Subject: [PATCH] Revert "ocaml-lablgl: use camlp5" This reverts commit 7a6aac90763e1c92fea53154c876e05a28067235. --- pkgs/development/ocaml-modules/lablgl/default.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 7fd7de1f756..c59f15c57ad 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp5 } : +{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : let pname = "lablgl"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; - buildInputs = [ ocaml findlib lablgtk freeglut camlp5 ]; + buildInputs = [ocaml findlib lablgtk freeglut camlp4]; propagatedBuildInputs = [ mesa ]; patches = [ ./Makefile.config.patch ./META.patch ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bcca2aaf0f8..73669c58b55 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -227,9 +227,7 @@ let jsonm = callPackage ../development/ocaml-modules/jsonm { }; - lablgl = callPackage ../development/ocaml-modules/lablgl { - camlp5 = camlp5_strict; - }; + lablgl = callPackage ../development/ocaml-modules/lablgl { }; lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview;