public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated Google Earth.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22064
This commit is contained in:
Eelco Dolstra 2010-05-30 23:25:30 +00:00
parent a6d63f4fab
commit 81cab76ecd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/googleearth/default.nix
View File

@ -6,11 +6,11 @@ zlib }:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "googleearth-5.1.3533.1731"; name = "googleearth-5.1.3535.3218";
src = fetchurl { src = fetchurl {
url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin; url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
sha256 = "1sxs1nwb2zh2j8dbwm65r04byn66yn79kpzhilhswly6r8d7yivg"; sha256 = "f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac";
}; };
buildNativeInputs = [ buildNativeInputs = [
@ -34,10 +34,12 @@ stdenv.mkDerivation {
]; ];
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
unpackPhase = '' unpackPhase = ''
bash $src --noexec --target unpacked bash $src --noexec --target unpacked
cd unpacked cd unpacked
''; '';
installPhase ='' installPhase =''
ensureDir $out/{opt/googleearth/,bin}; ensureDir $out/{opt/googleearth/,bin};
tar xf googleearth-data.tar -C $out/opt/googleearth tar xf googleearth-data.tar -C $out/opt/googleearth

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

@ -7934,9 +7934,9 @@ let
}; };
googleearth = import ../applications/misc/googleearth { googleearth = import ../applications/misc/googleearth {
inherit stdenv fetchurl glibc mesa freetype zlib glib; inherit (pkgsi686Linux) stdenv fetchurl glibc mesa freetype zlib glib;
inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes inherit (pkgsi686Linux.xlibs) libSM libICE libXi libXv libXrender
libXcursor libXinerama libXext libX11; libXrandr libXfixes libXcursor libXinerama libXext libX11;
}; };
gpsbabel = import ../applications/misc/gpsbabel { gpsbabel = import ../applications/misc/gpsbabel {