Author: urkud
Date: Wed Sep 15 18:52:07 2010
New Revision: 23812
URL: https://svn.nixos.org/websvn/nix/?rev=23812&sc=1
Log:
Don't try to build Qt guis if qt is unsupported on the platform
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/qgit/default.nix
nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/qgit/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/qgit/default.nix
Wed Sep 15 18:37:38 2010 (r23811)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/qgit/default.nix
Wed Sep 15 18:52:07 2010 (r23812)
@@ -7,7 +7,7 @@
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
{
Modified: nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix
Wed Sep 15 18:37:38 2010 (r23811)
+++ nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix
Wed Sep 15 18:52:07 2010 (r23812)
@@ -31,7 +31,7 @@
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 ];
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
