signal-desktop: 1.18.1 -> 1.19.0

A new dependency (at-spi2-atk) is required for libatk-bridge-2.0.so.

Also libstdc++.so.6 is now required from stdenv.cc.cc.lib (stdenv.cc.cc
doesn't offer it). The binary will only find libstdc++.so.6 via
$LD_LIBRARY_PATH (i.e. not via rpath, the run-time search path).
This commit is contained in:
Michael Weiss 2018-11-27 20:03:36 +01:00
parent 34f04810cf
commit e01209f2c7

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook { stdenv, lib, fetchurl, dpkg, wrapGAppsHook
, gnome2, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
, cups, expat, udev, libnotify , cups, expat, udev, libnotify
@ -24,6 +24,7 @@ let
rpath = lib.makeLibraryPath [ rpath = lib.makeLibraryPath [
alsaLib alsaLib
atk atk
at-spi2-atk
cairo cairo
cups cups
dbus dbus
@ -49,18 +50,17 @@ let
libXtst libXtst
nspr nspr
nss nss
stdenv.cc.cc
udev udev
xorg.libxcb xorg.libxcb
]; ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "signal-desktop-${version}"; name = "signal-desktop-${version}";
version = "1.18.1"; version = "1.19.0";
src = fetchurl { src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1gak6nhv5gk37iv1bfmjx6wf0p1vcln5y29i6fkzmvcrp3j2cmfh"; sha256 = "19a585mylbwrxd2m75hgp77ys1r350xkvawq2ysp0cxzr04l46z7";
}; };
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];
@ -84,6 +84,7 @@ in stdenv.mkDerivation rec {
--set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop
wrapProgram $out/libexec/signal-desktop \ wrapProgram $out/libexec/signal-desktop \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib" \
${customLanguageWrapperArgs} \ ${customLanguageWrapperArgs} \
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"