From 101aad1467561f14a1a6d69b004d993edfb4e8c2 Mon Sep 17 00:00:00 2001 From: Christophe Raffalli Date: Wed, 19 Jun 2013 04:39:08 +0200 Subject: [PATCH] camlimages ... still wasn't ok. Now better. --- pkgs/development/ocaml-modules/camlimages/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index db11fc4fb8b..037ebdea6b6 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng_apng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript, lablgtk }: +{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng12, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,9 +14,9 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng_apng giflib freetype libXpm lablgtk]; - - propagatedbuildInputs = [libtiff libjpeg libpng_apng giflib freetype libXpm lablgtk ]; + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng12 giflib freetype libXpm ]; + + propagatedbuildInputs = [libtiff libjpeg libpng12 giflib freetype libXpm ]; createFindlibDestdir = true;