diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-06-26 16:48:45 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-06-27 21:35:21 +0200 |
| commit | 0b17251c06e9b63456b90c4046b7a2dbb39f8155 (patch) | |
| tree | cf18b55161a8fcad3cb14237685c1d2c6fd16d84 /pkgs/development/ocaml-modules/camlimages | |
| parent | 7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16 (diff) | |
| download | nixlib-0b17251c06e9b63456b90c4046b7a2dbb39f8155.tar nixlib-0b17251c06e9b63456b90c4046b7a2dbb39f8155.tar.gz nixlib-0b17251c06e9b63456b90c4046b7a2dbb39f8155.tar.bz2 nixlib-0b17251c06e9b63456b90c4046b7a2dbb39f8155.tar.lz nixlib-0b17251c06e9b63456b90c4046b7a2dbb39f8155.tar.xz nixlib-0b17251c06e9b63456b90c4046b7a2dbb39f8155.tar.zst nixlib-0b17251c06e9b63456b90c4046b7a2dbb39f8155.zip | |
libpng: keep versioning in all-packages.nix, not in individual expressions
Diffstat (limited to 'pkgs/development/ocaml-modules/camlimages')
| -rw-r--r-- | pkgs/development/ocaml-modules/camlimages/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
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; |