Unverified Commit d3fc39e0 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #309329 from andresilva/signal-remove-tray-fix 

signal-desktop: remove tray icon fix
parents 66ae2791 d5db34e8

pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix

+4 −4
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ 
let

  inherit (stdenv) targetPlatform;

  ARCH = if targetPlatform.isAarch64 then "arm64" else "x64";

in stdenv.mkDerivation rec {

in

stdenv.mkDerivation rec {

  inherit pname version;



  # Please backport all updates to the stable channel.
@@ -155,10 +156,9 @@ in stdenv.mkDerivation rec { 
      --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}

    )



    # Fix the desktop link and fix showing application icon in tray

    # Fix the desktop link

    substituteInPlace $out/share/applications/${pname}.desktop \

      --replace "/opt/${dir}/${pname}" $out/bin/${pname} \

      ${if pname == "signal-desktop" then "--replace \"bin/signal-desktop\" \"bin/signal-desktop --use-tray-icon\"" else ""}

      --replace "/opt/${dir}/${pname}" $out/bin/${pname}



    # Note: The following path contains bundled libraries:

    # $out/lib/${dir}/resources/app.asar.unpacked/node_modules/