From a9dc68b1eae0ed8f150386a9698ccaf11051161f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 16 Sep 2009 15:12:24 +0000 Subject: [PATCH] Specify some obvious platform sets svn path=/nixpkgs/trunk/; revision=17205 --- pkgs/development/python-modules/pyqt/default.nix | 1 + pkgs/lib/platforms.nix | 1 + pkgs/tools/misc/partition-manager/default.nix | 1 + pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index ac7e3efcee4..45ed2d1f031 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation { license = "GPL"; homepage = http://www.riverbankcomputing.co.uk; maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix index ecb13e2773d..c63544ce59d 100644 --- a/pkgs/lib/platforms.nix +++ b/pkgs/lib/platforms.nix @@ -9,4 +9,5 @@ rec { cygwin = ["i686-cygwin"]; all = linux ++ darwin ++ cygwin ++ freebsd; allBut = platform: lists.filter (x: platform != x) all; + mesaPlatforms = linux ++ darwin ++ freebsd; } diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index ef779b55475..456e12fe498 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ? license = "GPL"; maintainers = [args.lib.maintainers.marcweber]; + platforms = args.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 549aed5fa92..a67b4cc2f18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3866,7 +3866,8 @@ let mesaSupported = system == "i686-linux" || - system == "x86_64-linux"; + system == "x86_64-linux" || + system == "i686-darwin"; mesa = import ../development/libraries/mesa { inherit fetchurl stdenv pkgconfig expat x11 xlibs libdrm;