diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 085fa9fed2a..77120a838f5 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -6,11 +6,11 @@ zlib }: assert stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "googleearth-5.1.3533.1731"; + name = "googleearth-5.1.3535.3218"; src = fetchurl { url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin; - sha256 = "1sxs1nwb2zh2j8dbwm65r04byn66yn79kpzhilhswly6r8d7yivg"; + sha256 = "f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac"; }; buildNativeInputs = [ @@ -34,10 +34,12 @@ stdenv.mkDerivation { ]; phases = "unpackPhase installPhase"; + unpackPhase = '' bash $src --noexec --target unpacked cd unpacked ''; + installPhase ='' ensureDir $out/{opt/googleearth/,bin}; tar xf googleearth-data.tar -C $out/opt/googleearth diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9846a66c63..ff33097a09e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7934,9 +7934,9 @@ 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 (pkgsi686Linux) stdenv fetchurl glibc mesa freetype zlib glib; + inherit (pkgsi686Linux.xlibs) libSM libICE libXi libXv libXrender + libXrandr libXfixes libXcursor libXinerama libXext libX11; }; gpsbabel = import ../applications/misc/gpsbabel {