From 0b17251c06e9b63456b90c4046b7a2dbb39f8155 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 26 Jun 2013 16:48:45 +0200 Subject: [PATCH] libpng: keep versioning in all-packages.nix, not in individual expressions --- pkgs/applications/audio/spotify/default.nix | 4 +-- .../display-managers/slim/default.nix | 4 +-- pkgs/applications/graphics/gimp/default.nix | 4 +-- .../google-talk-plugin/default.nix | 4 +-- .../science/math/glsurf/default.nix | 5 ++-- pkgs/development/libraries/gegl/0_0_22.nix | 4 +-- .../libraries/leptonica/default.nix | 4 +-- pkgs/development/libraries/qt-3/default.nix | 4 +-- .../ocaml-modules/camlimages/default.nix | 8 +++--- pkgs/games/minetest/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 25 +++++++++++++++---- 11 files changed, 42 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index ccdfcbb3d992..f4d264c0d8f8 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -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; diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 601aa7bf53a7..9d5c728de262 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -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 ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index f2a4ec90f978..33d52c6645be 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 0110dad9dc89..110f95220308 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -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 diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 51b2850347b5..a056a32c64c2 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -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 diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix index 4eeb6886d71a..b2f2e85a1ea8 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 177b2d1f2600..e84bd0656c4e 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 a24f444488d7..b3dfc021da95 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 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; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 0a9a40140ef0..6c860d42925a 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22e43b0e4c92..fbd8cac417ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {