diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2017-02-03 21:05:31 +0100 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2017-02-03 22:12:53 +0100 |
| commit | 7a6aac90763e1c92fea53154c876e05a28067235 (patch) | |
| tree | cbd2bf19503a35e4d60452aa8236f74c80204844 | |
| parent | 2352099a962261bd41906dc6ed25966ffbae6640 (diff) | |
| download | nixlib-7a6aac90763e1c92fea53154c876e05a28067235.tar nixlib-7a6aac90763e1c92fea53154c876e05a28067235.tar.gz nixlib-7a6aac90763e1c92fea53154c876e05a28067235.tar.bz2 nixlib-7a6aac90763e1c92fea53154c876e05a28067235.tar.lz nixlib-7a6aac90763e1c92fea53154c876e05a28067235.tar.xz nixlib-7a6aac90763e1c92fea53154c876e05a28067235.tar.zst nixlib-7a6aac90763e1c92fea53154c876e05a28067235.zip | |
ocaml-lablgl: use camlp5
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index c59f15c57ad6..7fd7de1f756d 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, camlp4 } : +{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp5 } : let pname = "lablgl"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; - buildInputs = [ocaml findlib lablgtk freeglut camlp4]; + buildInputs = [ ocaml findlib lablgtk freeglut camlp5 ]; 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 4f2a635e6ff1..c55c3a5a0685 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -225,7 +225,9 @@ let jsonm = callPackage ../development/ocaml-modules/jsonm { }; - lablgl = callPackage ../development/ocaml-modules/lablgl { }; + lablgl = callPackage ../development/ocaml-modules/lablgl { + camlp5 = camlp5_strict; + }; lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; |