libpng: keep versioning in all-packages.nix, not in individual expressions

This commit is contained in:
Mathijs Kwik
2013-06-27 21:35:21 +02:00
parent 7f413e4d5c
commit 0b17251c06
11 changed files with 42 additions and 28 deletions
@@ -1,5 +1,4 @@
{ stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng12, giflib }:
{ stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -16,7 +15,7 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib freeglut mesa
lablgl camlimages ocaml_mysql mlgmp mpfr gmp
libtiff libjpeg libpng12 giflib ];
libtiff libjpeg libpng giflib ];
installPhase = ''
mkdir -p $out/bin $out/share/doc/glsurf