diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-01-24 13:21:04 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2020-01-24 17:49:39 +0100 |
commit | 9cf50fa55c2d67be4ccea9a9b8c2f15321ca9a13 (patch) | |
tree | fd4f19fefceaaa1cfcc9a5fd7cbf33c868307337 /pkgs/applications/networking/instant-messengers/signal-desktop | |
parent | ee28f38a4805fe22e37f4eb0a54df09eae43bcc5 (diff) |
signal-desktop: 1.29.6 -> 1.30.0
Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v1.30.0
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/signal-desktop')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/signal-desktop/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index bc41b02362746..4358ed8f20191 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,9 +1,8 @@ -{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, systemd, libnotify, libuuid, at-spi2-core, libappindicator-gtk3 -, autoPatchelfHook # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -24,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.29.6"; # Please backport all updates to the stable channel. + version = "1.30.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1s1rc4kyv0nxz5fy5ia7fflphf3izk80ks71q4wd67k1g9lvcw24"; + sha256 = "1gbvna40sc83s7mwip5281yn4bs0k19fj061y0xzwkvh0yk06x3i"; }; nativeBuildInputs = [ @@ -88,12 +87,20 @@ in stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; dontPatchELF = true; + # We need to run autoPatchelf manually with the "no-recurse" option, see + # https://github.com/NixOS/nixpkgs/pull/78413 for the reasons. + dontAutoPatchelf = true; installPhase = '' mkdir -p $out/lib mv usr/share $out/share - mv opt/Signal $out/lib + mv opt/Signal $out/lib/Signal + + # Note: The following path contains bundled libraries: + # $out/lib/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/ + # We run autoPatchelf with the "no-recurse" option to avoid picking those + # up, but resources/app.asar still requires them. # Symlink to bin mkdir -p $out/bin @@ -109,6 +116,8 @@ in stdenv.mkDerivation rec { # Fix the desktop link substituteInPlace $out/share/applications/signal-desktop.desktop \ --replace /opt/Signal/signal-desktop $out/bin/signal-desktop + + autoPatchelf --no-recurse -- $out/lib/Signal/ ''; meta = { |