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

4 files changed, 10 insertions, 10 deletions

diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix
index 4eeb6886d71..b2f2e85a1ea 100644
--- a/pkgs/development/libraries/gegl/0_0_22.nix
+++ b/pkgs/development/libraries/gegl/0_0_22.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg
+{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng, cairo, libjpeg
 , librsvg, pango, gtk }:
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   configureFlags = "--disable-docs"; # needs fonts otherwise  don't know how to pass them
 
-  buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ];
+  buildInputs = [ pkgconfig glib babl_0_0_22 libpng cairo libjpeg librsvg pango gtk ];
 
   meta = {
     description = "Graph-based image processing framework";
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index 177b2d1f260..e84bd0656c4 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libpng12, libtiff, libjpeg, zlib}:
+{stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}:
 
 stdenv.mkDerivation {
   name = "leptonica-1.68";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc";
   };
 
-  buildInputs = [ libpng12 libtiff libjpeg zlib ];
+  buildInputs = [ libpng libtiff libjpeg zlib ];
 
   meta = {
     description = "Image processing and analysis library";
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index a24f444488d..b3dfc021da9 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -7,10 +7,10 @@
 , threadSupport ? true
 , mysqlSupport ? false, mysql ? null
 , openglSupport ? false, mesa ? null, libXmu ? null
-, x11, xextproto, zlib, libjpeg, libpng12, which
+, x11, xextproto, zlib, libjpeg, libpng, which
 }:
 
-let libpng = libpng12; in
+let libpng = libpng; in
 
 assert xftSupport -> libXft != null;
 assert xrenderSupport -> xftSupport && libXrender != null;
diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index 29816d297b5..21610f8f310 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;