From 139de1ea2f66b6fc1e8bda062265170242bf4cb0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 15 Sep 2010 18:52:07 +0000 Subject: [PATCH] Don't try to build Qt guis if qt is unsupported on the platform svn path=/nixpkgs/trunk/; revision=23812 --- .../version-management/git-and-tools/qgit/default.nix | 2 +- pkgs/development/tools/build-managers/cmake/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 71abaa67deab..963f4dd295b5 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { license = "GPLv2"; homepage = "http://digilander.libero.it/mcostalba/"; description = "Graphical front-end to Git"; - platforms = stdenv.lib.platforms.all; + inherit (qt.meta) platforms; }; src = fetchurl { diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 587b7dce2204..cc5fce60e72f 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; - platforms = stdenv.lib.platforms.all; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; }