ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Add meta.platforms to qt4 and merkaartor

Browse Source 
Should fix one of hydra evaluation errors

svn path=/nixpkgs/trunk/; revision=22360
This commit is contained in:
Yury G. Kudryashov 2010-06-21 17:06:08 +00:00
parent 449a75420c
commit b39389560f
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/merkaartor/default.nix
View File

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

5
pkgs/development/libraries/qt-4.x/4.5/default.nix
View File

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

5
pkgs/development/libraries/qt-4.x/4.6/default.nix
View File

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

6
pkgs/development/libraries/qt-4.x/4.7/default.nix
View File

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

6
pkgs/top-level/all-packages.nix
View File

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

3
pkgs/top-level/release.nix
View File

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