dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ocaml-lablgl: use camlp5

Browse Source
This commit is contained in:
Pascal Wittmann 2017-02-03 21:05:31 +01:00
parent 2352099a96
commit 7a6aac9076
No known key found for this signature in database
GPG Key ID: C899ACE7E2322852
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/ocaml-modules/lablgl/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : {stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp5 } :
let let
pname = "lablgl"; pname = "lablgl";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq";
}; };
buildInputs = [ocaml findlib lablgtk freeglut camlp4]; buildInputs = [ ocaml findlib lablgtk freeglut camlp5 ];
propagatedBuildInputs = [ mesa ]; propagatedBuildInputs = [ mesa ];
patches = [ ./Makefile.config.patch ./META.patch ]; patches = [ ./Makefile.config.patch ./META.patch ];

4
pkgs/top-level/ocaml-packages.nix
View File

@ -225,7 +225,9 @@ let
jsonm = callPackage ../development/ocaml-modules/jsonm { }; 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 { lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix {
inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview;