googleearth-pro: 7.3.3.7786 -> 7.3.4.8248

Switch back to using bundled libraries. This fixes program startup and
graphical errors during runtime. Fixes #141239.
This commit is contained in:
squalus 2021-10-30 13:35:36 -07:00
parent 49d91d32c8
commit 1f911dc73c

View file

@ -2,26 +2,14 @@
, stdenv , stdenv
, mkDerivation , mkDerivation
, fetchurl , fetchurl
, ffmpeg_3
, freetype , freetype
, gdal_2
, glib , glib
, libGL , libGL
, libGLU , libGLU
, libICE
, libSM , libSM
, libXi
, libXv
, libav_12
, libXrender , libXrender
, libXrandr
, libXfixes
, libXcursor
, libXinerama
, libXext
, libX11 , libX11
, libXcomposite
, libxcb , libxcb
, sqlite , sqlite
@ -34,11 +22,8 @@
, dbus , dbus
, makeWrapper , makeWrapper
, qtlocation , cups
, qtwebkit , alsa-lib
, qtx11extras
, qtsensors
, qtscript
, xkeyboardconfig , xkeyboardconfig
, autoPatchelfHook , autoPatchelfHook
@ -50,49 +35,34 @@ let
in in
mkDerivation rec { mkDerivation rec {
pname = "googleearth-pro"; pname = "googleearth-pro";
version = "7.3.3.7786"; version = "7.3.4.8248";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-pro-stable/google-earth-pro-stable_${version}-r0_${arch}.deb"; url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-pro-stable/google-earth-pro-stable_${version}-r0_${arch}.deb";
sha256 = "1s3cakwrgf702g33rh8qs657d8bl68wgg8k89rksgvswwpd2zbb3"; sha256 = "1pbapi267snlrjari5k93y6kbrjsqhqxgkxxqaqv4r25az00dx6d";
}; };
nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ];
propagatedBuildInputs = [ xkeyboardconfig ]; propagatedBuildInputs = [ xkeyboardconfig ];
buildInputs = [ buildInputs = [
dbus dbus
ffmpeg_3 cups
fontconfig fontconfig
freetype freetype
gdal_2
glib glib
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gstreamer gst_all_1.gstreamer
libGL libGL
libGLU libGLU
libICE
libSM libSM
libX11 libX11
libXcomposite
libXcursor
libXext
libXfixes
libXi
libXinerama
libXrandr
libXrender libXrender
libXv
libav_12
libproxy libproxy
libxcb libxcb
libxml2 libxml2
qtlocation
qtscript
qtsensors
qtwebkit
qtx11extras
sqlite sqlite
zlib zlib
alsa-lib
]; ];
doInstallCheck = true; doInstallCheck = true;
@ -131,17 +101,6 @@ mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
postInstall = ''
find "$out/opt/google/earth/pro" -name "*.so.*" | \
egrep -v 'libssl*|libcrypto*|libicu*' | \
xargs rm
find "$out/opt/google/earth/pro" -name "*.so" | \
egrep -v 'libgoogle*|libauth*|libbase*|libcommon*|libcommon_gui*|libcommon_platform*|libcommon_webbrowser*|libcomponentframework*|libgeobase*|libgeobaseutils*|libge_net*|libgdata*|libgoogleapi*|libmath*|libmoduleframework*|libmaps*|libport*|libprintmodule*|libprofile*|librender*|libreporting*|libsgutil*|libspatial*|libxsltransform*|libbase*|libport*|libport*|libbase*|libcomponentframework*|libIGCore*|libIGUtils*|libaction*|libapiloader*|libapiloader*|libIGCore*|libIGUtils*|libIGMath*|libfusioncommon*|libge_exif*|libaction*|libfusioncommon*|libapiloader*|liblayer*|libapiloader*|libIGAttrs*|libIGCore*|libIGGfx*|libIGMath*|libIGSg*|libIGUtils*|libwmsbase*|libwebbrowser*|libevllpro*|libalchemyext*|libge_cache*|libflightsim*|libnpgeinprocessplugin*|libmeasure*|libviewsync*|libcapture*|libtheme*|libgps*|libgisingest*|libsearchmodule*|libinput_plugin*|libnavigate*|libspnav*|libsearch*|libLeap*' | \
xargs rm
'';
autoPatchelfIgnoreMissingDeps=true;
installCheckPhase = '' installCheckPhase = ''
$out/bin/gpsbabel -V > /dev/null $out/bin/gpsbabel -V > /dev/null
''; '';
@ -159,5 +118,6 @@ mkDerivation rec {
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ friedelino shamilton ]; maintainers = with maintainers; [ friedelino shamilton ];
platforms = platforms.linux; platforms = platforms.linux;
knownVulnerabilities = [ "Includes vulnerable bundled libraries." ];
}; };
} }