From b39389560f18ee63f88dff501b30681aee44571e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 21 Jun 2010 17:06:08 +0000 Subject: [PATCH] Add meta.platforms to qt4 and merkaartor Should fix one of hydra evaluation errors svn path=/nixpkgs/trunk/; revision=22360 --- pkgs/applications/misc/merkaartor/default.nix | 2 +- pkgs/development/libraries/qt-4.x/4.5/default.nix | 5 +++-- pkgs/development/libraries/qt-4.x/4.6/default.nix | 5 +++-- pkgs/development/libraries/qt-4.x/4.7/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 6 +++--- pkgs/top-level/release.nix | 3 --- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 3c88423d0459..4c29855da07a 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = http://merkaartor.org/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + platforms = qt.meta.platforms; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.5/default.nix b/pkgs/development/libraries/qt-4.x/4.5/default.nix index d7d69a3fa8e5..35960c4d8ba8 100644 --- a/pkgs/development/libraries/qt-4.x/4.5/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib +{ stdenv, fetchurl , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu , libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig , zlib, libjpeg, mysql, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib @@ -78,6 +78,7 @@ stdenv.mkDerivation { homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp; description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix index 707f261f6001..9440765d830d 100644 --- a/pkgs/development/libraries/qt-4.x/4.6/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib +{ stdenv, fetchurl , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu , libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig , zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { homepage = http://qt.nokia.com/products; description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; - maintainers = with lib.maintainers; [ sander urkud ]; + maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix index 0bb61a07bcb6..fbcd8b24a337 100644 --- a/pkgs/development/libraries/qt-4.x/4.7/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib +{ stdenv, fetchurl , alsaLib, gstreamer, gstPluginsBase, pulseaudio , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu , libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig @@ -100,8 +100,8 @@ stdenv.mkDerivation rec { homepage = http://qt.nokia.com/products; description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; - maintainers = with lib.maintainers; [ urkud sander ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ urkud sander ]; + platforms = stdenv.lib.platforms.mesaPlatforms; priority = 10; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc302678e902..f53b408714a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5150,7 +5150,7 @@ let qt4 = qt46; qt45 = import ../development/libraries/qt-4.x/4.5 { - inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus + inherit fetchurl stdenv zlib libjpeg libpng which mysql mesa openssl cups dbus fontconfig freetype pkgconfig libtiff; inherit (xlibs) xextproto libXft libXrender libXrandr randrproto libXmu libXinerama xineramaproto libXcursor libXext @@ -5159,7 +5159,7 @@ let }; qt46 = makeOverridable (import ../development/libraries/qt-4.x/4.6) { - inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus + inherit fetchurl stdenv zlib libjpeg libpng which mysql mesa openssl cups dbus fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib postgresql; inherit (xlibs) xextproto libXft libXrender libXrandr randrproto @@ -5169,7 +5169,7 @@ let }; qt47 = makeOverridable (import ../development/libraries/qt-4.x/4.7) { - inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus + inherit fetchurl stdenv zlib libjpeg libpng which mysql mesa openssl cups dbus fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib postgresql pulseaudio; inherit (gst_all) gstreamer gstPluginsBase; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 77bcb8e87941..59b8ce1a62a8 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -255,9 +255,6 @@ with (import ./release-lib.nix); pythonFull = linux; sbcl = all; qt3 = linux; - qt4 = linux; - qt45 = linux; - qt46 = linux; quake3demo = linux; readline = all; reiserfsprogs = linux;