Author: urkud Date: 2010-06-21 17:06:08 +0000 (Mon, 21 Jun 2010) New Revision: 22360
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22360&view=rev Modified: nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.5/default.nix nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.6/default.nix nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix nixpkgs/trunk/pkgs/top-level/release.nix Log: Add meta.platforms to qt4 and merkaartor Should fix one of hydra evaluation errors Changes: Modified: nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix 2010-06-21 16:06:18 UTC (rev 22359) +++ nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix 2010-06-21 17:06:08 UTC (rev 22360) @@ -18,6 +18,6 @@ homepage = http://merkaartor.org/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + platforms = qt.meta.platforms; }; } Modified: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.5/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.5/default.nix 2010-06-21 16:06:18 UTC (rev 22359) +++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.5/default.nix 2010-06-21 17:06:08 UTC (rev 22360) @@ -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 @@ 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; }; } Modified: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.6/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.6/default.nix 2010-06-21 16:06:18 UTC (rev 22359) +++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.6/default.nix 2010-06-21 17:06:08 UTC (rev 22360) @@ -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 @@ 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; }; } Modified: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix 2010-06-21 16:06:18 UTC (rev 22359) +++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.7/default.nix 2010-06-21 17:06:08 UTC (rev 22360) @@ -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 @@ 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; }; } Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-21 16:06:18 UTC (rev 22359) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-21 17:06:08 UTC (rev 22360) @@ -5150,7 +5150,7 @@ 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 @@ }; 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 @@ }; 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; Modified: nixpkgs/trunk/pkgs/top-level/release.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/release.nix 2010-06-21 16:06:18 UTC (rev 22359) +++ nixpkgs/trunk/pkgs/top-level/release.nix 2010-06-21 17:06:08 UTC (rev 22360) @@ -255,9 +255,6 @@ pythonFull = linux; sbcl = all; qt3 = linux; - qt4 = linux; - qt45 = linux; - qt46 = linux; quake3demo = linux; readline = all; reiserfsprogs = linux; _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
