libpng: keep versioning in all-packages.nix, not in individual expressions
This commit is contained in:
parent
7f413e4d5c
commit
0b17251c06
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng12, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }:
|
||||
{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }:
|
||||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
|
||||
|
@ -73,7 +73,7 @@ stdenv.mkDerivation {
|
|||
mkdir -p $out/libexec/spotify
|
||||
gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
|
||||
|
||||
wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng12 cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
|
||||
wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
|
||||
''; # */
|
||||
|
||||
dontStrip = true;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng, libXmu
|
||||
, fontconfig, freetype, pam, dbus_libs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs =
|
||||
[ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
|
||||
[ cmake pkgconfig x11 libjpeg libpng libXmu fontconfig freetype
|
||||
pam dbus_libs
|
||||
];
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, freetype
|
||||
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng12, libexif, zlib, perl
|
||||
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
|
||||
, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22
|
||||
}:
|
||||
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
pkgconfig gtk freetype fontconfig
|
||||
libart_lgpl libtiff libjpeg libpng12 libexif zlib perl
|
||||
libart_lgpl libtiff libjpeg libpng libexif zlib perl
|
||||
perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22
|
||||
];
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo
|
||||
, libpng12, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
|
||||
, libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
|
||||
, dbus_glib, alsaLib, pulseaudio, udev, pango
|
||||
}:
|
||||
|
||||
|
@ -14,7 +14,7 @@ let
|
|||
xorg.libXt
|
||||
xorg.libX11
|
||||
cairo
|
||||
libpng12
|
||||
libpng
|
||||
gtk
|
||||
glib
|
||||
fontconfig
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit, cmake, irrlicht3843, libpng12, bzip2,
|
||||
{ stdenv, fetchgit, cmake, irrlicht3843, libpng, bzip2,
|
||||
libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }:
|
||||
|
||||
let
|
||||
|
@ -23,7 +23,7 @@ in stdenv.mkDerivation {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
cmake irrlicht3843 libpng12 bzip2 libjpeg
|
||||
cmake irrlicht3843 libpng bzip2 libjpeg
|
||||
libXxf86vm mesa openal libvorbis x11
|
||||
];
|
||||
|
||||
|
|
|
@ -1191,7 +1191,9 @@ let
|
|||
|
||||
minecraft = callPackage ../games/minecraft { };
|
||||
|
||||
minetest = callPackage ../games/minetest { };
|
||||
minetest = callPackage ../games/minetest {
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
miniupnpc = callPackage ../tools/networking/miniupnpc { };
|
||||
|
||||
|
@ -2744,7 +2746,9 @@ let
|
|||
camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
|
||||
camomile = callPackage ../development/ocaml-modules/camomile { };
|
||||
|
||||
camlimages = callPackage ../development/ocaml-modules/camlimages { };
|
||||
camlimages = callPackage ../development/ocaml-modules/camlimages {
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
|
||||
|
||||
|
@ -3921,6 +3925,7 @@ let
|
|||
|
||||
gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix {
|
||||
# avocodec avformat librsvg
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
geoclue = callPackage ../development/libraries/geoclue {};
|
||||
|
@ -4044,6 +4049,7 @@ let
|
|||
|
||||
glsurf = callPackage ../applications/science/math/glsurf {
|
||||
inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp;
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
gmime = callPackage ../development/libraries/gmime { };
|
||||
|
@ -4333,7 +4339,9 @@ let
|
|||
|
||||
levmar = callPackage ../development/libraries/levmar { };
|
||||
|
||||
leptonica = callPackage ../development/libraries/leptonica { };
|
||||
leptonica = callPackage ../development/libraries/leptonica {
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
lib3ds = callPackage ../development/libraries/lib3ds { };
|
||||
|
||||
|
@ -5114,6 +5122,7 @@ let
|
|||
|
||||
qt3 = callPackage ../development/libraries/qt-3 {
|
||||
openglSupport = mesaSupported;
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
qt4 = pkgs.kde4.qt4;
|
||||
|
@ -7425,6 +7434,7 @@ let
|
|||
|
||||
gimp_2_6 = callPackage ../applications/graphics/gimp {
|
||||
inherit (gnome) libart_lgpl;
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
|
||||
|
@ -7548,7 +7558,9 @@ let
|
|||
|
||||
googleearth = callPackage_i686 ../applications/misc/googleearth { };
|
||||
|
||||
google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { };
|
||||
google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
gosmore = builderDefsPackage ../applications/misc/gosmore {
|
||||
inherit fetchsvn curl pkgconfig libxml2 gtk;
|
||||
|
@ -8175,7 +8187,9 @@ let
|
|||
|
||||
lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
|
||||
|
||||
slim = callPackage ../applications/display-managers/slim { };
|
||||
slim = callPackage ../applications/display-managers/slim {
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
sndBase = builderDefsPackage (import ../applications/audio/snd) {
|
||||
inherit fetchurl stdenv stringsWithDeps lib fftw;
|
||||
|
@ -8203,6 +8217,7 @@ let
|
|||
|
||||
spotify = callPackage ../applications/audio/spotify {
|
||||
inherit (gnome) GConf;
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
libspotify = callPackage ../development/libraries/libspotify {
|
||||
|
|
Loading…
Reference in a new issue