diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-02-05 19:22:26 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-02-05 19:22:26 +0000 |
commit | 8c8631d9749843b1be9fb524c7b92fc05dd577b1 (patch) | |
tree | 7b92c4c00590e753181947d95b938fb9446b632e | |
parent | 9c70c2f0a264559970837b83ce6be72e72ba1c1e (diff) |
* Don't set `platforms' on Google Earth because we don't want Hydra to
build it. svn path=/nixpkgs/trunk/; revision=19839
-rw-r--r-- | pkgs/applications/misc/googleearth/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 0d4b5fd03fb89..550a7666b9d3a 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation { description = "A world sphere viewer"; homepage = http://earth.google.com; license = "unfree"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a1979cc6ec7e..e03e90596c519 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7113,11 +7113,11 @@ let }; googleearth = import ../applications/misc/googleearth { - inherit stdenv fetchurl glibc mesa freetype zlib glib; - inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes - libXcursor libXinerama libXext libX11; - inherit patchelf05; - }; + inherit stdenv fetchurl glibc mesa freetype zlib glib; + inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes + libXcursor libXinerama libXext libX11; + inherit patchelf05; + }; gpsbabel = import ../applications/misc/gpsbabel { inherit fetchurl stdenv zlib expat; |