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

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

Browse Source
This commit is contained in:
Mathijs Kwik
2013-06-26 16:48:45 +02:00
parent 7f413e4d5c
commit 0b17251c06
11 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gegl/0_0_22.nix
View File

@@ -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";

4
pkgs/development/libraries/leptonica/default.nix
View File

@@ -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";

4
pkgs/development/libraries/qt-3/default.nix
View File

@@ -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;