diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-10-03 23:19:32 +0100 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2014-10-08 20:23:30 +0200 |
| commit | 7fd487018ca90926e4596c7e88e55fb431eedb13 (patch) | |
| tree | b29d9bc745876267608db96b6d03660bb3881edc /pkgs/development/ocaml-modules/lablgl | |
| parent | 3f2a64d13226a0401c1ed9475d0f9d6890b2e615 (diff) | |
ocaml-lablgl: fixes the META file
Diffstat (limited to 'pkgs/development/ocaml-modules/lablgl')
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgl/META.patch | 18 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgl/default.nix | 11 |
2 files changed, 24 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/lablgl/META.patch b/pkgs/development/ocaml-modules/lablgl/META.patch new file mode 100644 index 00000000000..bf5b2184ac0 --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgl/META.patch @@ -0,0 +1,18 @@ +diff -r 562eb6ecb8ca META +--- a/META Wed Oct 01 20:09:24 2014 +0100 ++++ b/META Wed Oct 01 20:22:15 2014 +0100 +@@ -1,6 +1,5 @@ +-description "Bindings for OpenGL" ++description="Bindings for OpenGL" + version="1.05" +-directory="+lablGL" + archive(byte) = "lablgl.cma" + archive(native) = "lablgl.cmxa" + +@@ -16,4 +15,4 @@ + requires = "lablgl" + archive(byte) = "lablglut.cma" + archive(native) = "lablglut.cmxa" +-) +\ No newline at end of file ++) diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 7cefe26746f..c3b18bf3537 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -14,9 +14,10 @@ stdenv.mkDerivation { sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; - buildInputs = [ocaml findlib lablgtk mesa freeglut ]; + buildInputs = [ocaml findlib lablgtk freeglut ]; + propagatedBuildInputs = [ mesa ]; - patches = [ ./Makefile.config.patch ]; + patches = [ ./Makefile.config.patch ./META.patch ]; preConfigure = '' substituteInPlace Makefile.config \ @@ -35,10 +36,10 @@ stdenv.mkDerivation { cp ./META $out/lib/ocaml/${ocaml_version}/site-lib/lablgl ''; - meta = { + meta = with stdenv.lib; { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.pSub ]; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub vbgl ]; }; } |