diff --git a/srcpkgs/steam/INSTALL.msg b/srcpkgs/steam/INSTALL.msg index d94881fb905..5540e138c17 100644 --- a/srcpkgs/steam/INSTALL.msg +++ b/srcpkgs/steam/INSTALL.msg @@ -3,9 +3,9 @@ of the following packages for your hardware: For users of the open source drivers: - - mesa-ati-dri-32bit (AMD) - - mesa-intel-dri-32bit (Intel) - - mesa-nouveau-dri-32bit (NVIDIA) + - mesa-ati-dri-32bit + libGL-32bit (AMD) + - mesa-intel-dri-32bit + libGL-32bit (Intel) + - mesa-nouveau-dri-32bit + libGL-32bit (NVIDIA) For users of the proprietary NVIDIA driver: diff --git a/srcpkgs/steam/patches/steam-use-openssl.patch b/srcpkgs/steam/patches/void.patch similarity index 50% rename from srcpkgs/steam/patches/steam-use-openssl.patch rename to srcpkgs/steam/patches/void.patch index a8bdcaefa09..eda8e2a045d 100644 --- a/srcpkgs/steam/patches/steam-use-openssl.patch +++ b/srcpkgs/steam/patches/void.patch @@ -5,11 +5,11 @@ fi +# -- void -- -+# Preload lib{crypto,ssl} from openssl, our libressl seems to be incompatible. ++# Preload our libgcc_s, libstdc++ and libxcb shared libraries. +# -- void -- -+STEAM32_BSTRAP=${DEFAULTSTEAMDIR}/ubuntu12_32/steam-runtime/i386/lib/i386-linux-gnu -+STEAM64_BSTRAP=${DEFAULTSTEAMDIR}/ubuntu12_32/steam-runtime/amd64/lib/x86_64-linux-gnu -+export LD_PRELOAD="$STEAM32_BSTRAP/libcrypto.so.1.0.0:$STEAM32_BSTRAP/libssl.so.1.0.0" ++ ++ ++export LD_PRELOAD='/usr/$LIB/libstdc++.so.6 /usr/$LIB/libgcc_s.so.1 /usr/$LIB/libxcb.so.1' + # go to the install directory and run the client cp "$LAUNCHSTEAMBOOTSTRAPFILE" "$LAUNCHSTEAMDIR/bootstrap.tar.xz" diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template index ef2732e5422..cb3b8c0beb1 100644 --- a/srcpkgs/steam/template +++ b/srcpkgs/steam/template @@ -4,7 +4,7 @@ only_for_archs="i686 x86_64" pkgname=steam version=1.0.0.50 -revision=1 +revision=2 wrksrc=steam depends="xz curl dbus freetype gdk-pixbuf hicolor-icon-theme desktop-file-utils liberation-fonts-ttf" repository="nonfree"