From 0b17251c06e9b63456b90c4046b7a2dbb39f8155 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 26 Jun 2013 16:48:45 +0200 Subject: libpng: keep versioning in all-packages.nix, not in individual expressions --- pkgs/development/ocaml-modules/camlimages/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/ocaml-modules/camlimages') diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 29816d297b57..21610f8f3103 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, libpng12, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: +{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, 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 libpng12 giflib freetype libXpm ]; - - propagatedbuildInputs = [libtiff libjpeg libpng12 giflib freetype libXpm ]; + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng giflib freetype libXpm ]; + + propagatedbuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; createFindlibDestdir = true; -- cgit 1.4.1