Unverified Commit 2554cc95 authored by Marcin Serwin's avatar Marcin Serwin
Browse files

signal-desktop: 7.70.0 -> 7.72.1 



Signed-off-by: default avatarMarcin Serwin <marcin@serwin.dev>
parent 617b381d

pkgs/by-name/si/signal-desktop/libsignal-node.nix

+6 −13
Original line number Diff line number Diff line
@@ -24,23 +24,23 @@ let 
in

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "libsignal-node";

  version = "0.78.3";

  version = "0.81.0";



  src = fetchFromGitHub {

    owner = "signalapp";

    repo = "libsignal";

    tag = "v${finalAttrs.version}";

    hash = "sha256-BRNgNE7BR4mlCKS4sydxx7rrfy+s4bTpQkX9GbEfhTg=";

    hash = "sha256-SOQyps+iGVQ3RWPLmQHzXwmMwmR1PrGIbViCmNg60P4=";

  };



  cargoHash = "sha256-T8kSQFTvwAYZad9rQRK6vY8vEiilEKv1+fd/1EBlxjI=";

  cargoHash = "sha256-O4v9GgNrs4+HpfgoHh6YLy4dNF1LrF1ZS50RaEHh1iM=";



  npmRoot = "node";

  npmDeps = fetchNpmDeps {

    name = "${finalAttrs.pname}-npm-deps";

    inherit (finalAttrs) version src;

    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";

    hash = "sha256-e/WyQlea46qTx7x45QuYdlaShezHV5vuB3ptB2DRCVE=";

    hash = "sha256-KvMEQ9nJunqF2CDjiP3s3CMoeF+nbUpZDzSIMsImbPg=";

  };



  nativeBuildInputs = [
@@ -62,15 +62,8 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    ./dont-strip-absolute-paths.patch

  ];

  postPatch = ''

    substituteInPlace node/binding.gyp \

      --replace-fail "'--out-dir', '<(PRODUCT_DIR)/'," \

                     "'--out-dir', '$out/lib/<(NODE_OS_NAME)-<(target_arch)/'," \

      --replace-fail "'target_name': 'libsignal_client_<(NODE_OS_NAME)_<(target_arch).node'," \

                     "'target_name': '@signalapp+libsignal-client',"



    substituteInPlace node/build_node_bridge.py \

      --replace-fail "dst_base = 'libsignal_client_%s_%s' % (node_os_name, node_arch)" \

                     "dst_base = '@signalapp+libsignal-client'" \

      --replace-fail "'prebuilds'" "'$out/lib'" \

      --replace-fail "objcopy = shutil.which('%s-linux-gnu-objcopy' % cargo_target.split('-')[0]) or 'objcopy'" \

                     "objcopy = os.getenv('OBJCOPY', 'objcopy')"

  '';
@@ -79,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    runHook preBuild



    pushd node

    npx node-gyp rebuild

    npm run build -- --copy-to-prebuilds

    popd



    runHook postBuild

pkgs/by-name/si/signal-desktop/package.nix

+10 −8
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  lib,

  nodejs_22,

  pnpm_10,

  electron_37,

  electron_38,

  python3,

  makeWrapper,

  callPackage,
@@ -23,7 +23,7 @@ 
let

  nodejs = nodejs_22;

  pnpm = pnpm_10.override { inherit nodejs; };

  electron = electron_37;

  electron = electron_38;



  libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };

  signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
@@ -52,13 +52,13 @@ let 
    '';

  });



  version = "7.70.0";

  version = "7.72.1";



  src = fetchFromGitHub {

    owner = "signalapp";

    repo = "Signal-Desktop";

    tag = "v${version}";

    hash = "sha256-y9i9YQPsLt3SLqROyEZsyIkVy/os3hy+1UMUSFMZJTY=";

    hash = "sha256-X+ENbHnlr9VL+flaZAHsOjRSBnXHa32qLNEXntxnRLA=";

  };



  sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: { 
    fetcherVersion = 1;

    hash =

      if withAppleEmojis then

        "sha256-uVVUHvYhBCplKPyuS2+PKCxox8uWU2E/2EXLCG1ot54="

        "sha256-7VDIUyQBhFNrAmpfemKcNgjJEuvQ355uU6oZdWM1Hk8="

      else

        "sha256-tbfk/tIgqpjDtDiULbTVUOJf5i9eLX9xY7vUPrrjmu0=";

        "sha256-gpK4WZjD//jZkxLvhAzXVAKmLjya8D1MVCPD4KKJJdA=";

  };



  env = {

    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

    SIGNAL_ENV = "production";

    SOURCE_DATE_EPOCH = 1757542492;

    SOURCE_DATE_EPOCH = 1758811882;

  };



  preBuild = ''
@@ -218,10 +218,12 @@ stdenv.mkDerivation (finalAttrs: { 
      install -Dm644 $icon $out/share/icons/hicolor/`basename ''${icon%.png}`/apps/signal-desktop.png

    done



    # TODO: Remove --ozone-platform=wayland after next electron update,

    # see https://github.com/electron/electron/pull/48309

    makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \

      --add-flags "$out/share/signal-desktop/app.asar" \

      --set-default ELECTRON_FORCE_IS_PACKAGED 1 \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \

      --add-flags ${lib.escapeShellArg commandLineArgs}



    runHook postInstall

pkgs/by-name/si/signal-desktop/ringrtc.nix

+3 −3
Original line number Diff line number Diff line
@@ -19,16 +19,16 @@ let 
in

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "ringrtc";

  version = "2.57.0";

  version = "2.57.1";



  src = fetchFromGitHub {

    owner = "signalapp";

    repo = "ringrtc";

    tag = "v${finalAttrs.version}";

    hash = "sha256-m73SXjTES1sHGbQRtn9CjurFd/Xby5Yyn6uLVLigfiU=";

    hash = "sha256-U3sfNjJInT7QBqLLNK1j/0xzmwi/pfZZGOtL/JZ5gZM=";

  };



  cargoHash = "sha256-LRCgK/w+GcYBCWUKjytErQCxDtS15EnsVOr5Uq6F8ww=";

  cargoHash = "sha256-DcaZmOPVO/eAMZ9NsqmwnI2d7Vdz/aVmvI4COivvDBM=";



  cargoBuildFlags = [

    "-p"