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

Revert "ocaml-lablgl: use camlp5"

Browse Source 
This reverts commit 7a6aac9076.
This commit is contained in:
Pascal Wittmann 2017-02-09 09:14:51 +01:00
parent b6cc6bd088
commit 5de04f6d55
2 changed files with 3 additions and 5 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, 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 ];

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

@ -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;