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

camlimages: use omake rather than omake_rc1

Browse Source
This commit is contained in:
Vincent Laporte 2016-12-02 19:36:07 +00:00
parent 7f501d7f02
commit 3d804da983
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/camlimages/4.0.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
{ stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
let
pname = "camlimages";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4";
};
buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ];
buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ];
propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];

4
pkgs/development/ocaml-modules/camlimages/4.1.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
{stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
@ -15,7 +15,7 @@ stdenv.mkDerivation {
sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki";
};
buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ];
buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ];
propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];