From ef169ca69dc2d8b03e8f84f05f4e60a86c3d3fad Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 3 Oct 2014 23:27:14 +0100 Subject: [PATCH] camlimages: fixes the spelling of propagatedBuildInputs --- .../ocaml-modules/camlimages/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index ff344ef6f32..e3ab1d37b15 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "camlimages"; version = "4.0.1"; in @@ -14,9 +13,9 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng giflib freetype libXpm ]; + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; - propagatedbuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; + propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; createFindlibDestdir = true; @@ -32,12 +31,10 @@ stdenv.mkDerivation { omake install ''; - #makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; - - meta = { - homepage = http://cristal.inria.fr/camlimages; - description = "Image manipulation library"; - license = stdenv.lib.licenses.gpl2; -# maintainers = [ stdenv.lib.maintainers.roconnor ]; + meta = with stdenv.lib; { + homepage = https://bitbucket.org/camlspotter/camlimages; + description = "OCaml image processing library"; + license = licenses.lgpl2; + maintainers = [ maintainers.vbgl ]; }; }