signal-desktop: 7.73.0 -> 7.75.1 by teutat3s · Pull Request #452197 · NixOS/nixpkgs

teutat3s · 2025-10-15T09:02:53Z

Please check emoji features when testing this change.

I had to fix the emoji patch because upstream updated the emoji-datasource version in signalapp/Signal-Desktop@5350ead.

https://github.com/signalapp/Signal-Desktop/releases/tag/v7.74.0
https://github.com/signalapp/Signal-Desktop/releases/tag/v7.75.0
https://github.com/signalapp/Signal-Desktop/releases/tag/v7.75.1
signalapp/Signal-Desktop@v7.73.0...v7.75.1

Things done

Add a 👍 reaction to pull requests you find important.

Sigmanificient · 2025-10-15T12:10:06Z

`nixpkgs-review` result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 452197
Commit: 140707f3aac2071ac3a5c09561f76b8369ddf5ba (subsequent changes)
Merge: f35940345142a3b770e272a031f3a14c262ee370

Logs: https://github.com/Sigmanificient/nixpkgs-review-gha/actions/runs/18527688131

`x86_64-linux`

✅ 1 package built:

signal-desktop

`aarch64-linux`

✅ 1 package built:

signal-desktop

marcin-serwin

I'm guessing that version 7.75.0 will be published within the next 24 hours so perhaps it's better to wait a bit and update to it directly.

marcin-serwin · 2025-10-15T15:31:19Z

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

@@ -19,16 +19,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ringrtc";
-  version = "2.58.1";
+  version = "2.59.0";


You haven't updated webrtc sources.

Patch

diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index d9b28f488a..80abcfd66e 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -1,33 +1,25 @@ { "src": { "args": { - "hash": "sha256-Qj0UFRWfZrBG9WUX4zkyiatIekNSYXsneP5aLvufNh4=", + "hash": "sha256-mNj4Sw7EROc2Cn4nPSm789h1je7EOjNAg2s6fQ19Dcc=", "owner": "signalapp", "repo": "webrtc", - "tag": "7204c" + "tag": "7339c" }, "fetcher": "fetchFromGitHub" }, - "src/base": { - "args": { - "hash": "sha256-wKFvb28LeB7/YVGmWKhcvXCEeNB6HaxMgZJLpC5a1Zk=", - "rev": "4ba67f727a84a10e32a417dc7e194f4fc6a23390", - "url": "https://chromium.googlesource.com/chromium/src/base" - }, - "fetcher": "fetchFromGitiles" - }, "src/build": { "args": { - "hash": "sha256-Bfd3paXVGon4p85V2UO6vEHG/t1g8EAxvYQ+DdPcuI8=", - "rev": "7adbc7e3263f3ab427ba7c5ac7839a69082ff7fb", + "hash": "sha256-BFKseH/tEQcQ1UF2YPBcfMLY54qBmM7OboC15NFO9e0=", + "rev": "66d076c7ab192991f67891b062b35404f3cb0739", "url": "https://chromium.googlesource.com/chromium/src/build" }, "fetcher": "fetchFromGitiles" }, "src/buildtools": { "args": { - "hash": "sha256-adtGyo+wm8+keR0um1fOdChABdBYboGBawD0LfcY00w=", - "rev": "1fc7350e65e9d7848c083b83aaf67611e74a5654", + "hash": "sha256-c1I0yBRDb9JUkywmJJy0IZp802qJRsoQV72ydinzxVs=", + "rev": "0c4bbb0f8a874de0a2a15d196031c7303d04fbb3", "url": "https://chromium.googlesource.com/chromium/src/buildtools" }, "fetcher": "fetchFromGitiles" @@ -43,40 +35,40 @@ }, "src/testing": { "args": { - "hash": "sha256-CQg6fxDz0dk4fD+X53stTwJJ25feYoU9KdsgjTAzbp8=", - "rev": "44b0a8d794b28dbd74614e5f5e7da2b407030647", + "hash": "sha256-PkTTET3CB1pQLipi0e6m+fVhf7S3MSEqiYeLFg9Pbjs=", + "rev": "305de9533d3ee2840af0b3f2c8ed0b32802b0a5d", "url": "https://chromium.googlesource.com/chromium/src/testing" }, "fetcher": "fetchFromGitiles" }, "src/third_party": { "args": { - "hash": "sha256-KfIQS+FrzFDAS0B3yfzPj4PqD16H0dBE6z1JgFag/20=", - "rev": "8a150db896356cd9b47f8c1a6d916347393f90f2", + "hash": "sha256-P0fhs0vabiD7+C2ILX6gE62RKXfXbLmHRjbWLpqY48g=", + "rev": "e30091e8987ee0bb0cd30bc467250a96a7614762", "url": "https://chromium.googlesource.com/chromium/src/third_party" }, "fetcher": "fetchFromGitiles" }, "src/third_party/boringssl/src": { "args": { - "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM=", - "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403", + "hash": "sha256-bpsZTEQ2/TE7xxhOtDz5PKzkOClImHtCTgOaINzg8Vk=", + "rev": "ddb2ca4b48fca9a1c468d83dc513b837331843ac", "url": "https://boringssl.googlesource.com/boringssl.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/breakpad/breakpad": { "args": { - "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo=", - "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc", + "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok=", + "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94", "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/catapult": { "args": { - "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0=", - "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d", + "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM=", + "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9", "url": "https://chromium.googlesource.com/catapult.git" }, "fetcher": "fetchFromGitiles" @@ -107,8 +99,8 @@ }, "src/third_party/compiler-rt/src": { "args": { - "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4=", - "rev": "57196dd146582915c955f6d388e31aea93220c51", + "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8=", + "rev": "dc425afb37a69b60c8c02fef815af29e91b61773", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git" }, "fetcher": "fetchFromGitiles" @@ -123,24 +115,24 @@ }, "src/third_party/dav1d/libdav1d": { "args": { - "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=", - "rev": "8d956180934f16244bdb58b39175824775125e55", + "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc=", + "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833", "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/depot_tools": { "args": { - "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A=", - "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490", + "hash": "sha256-+jbfCtruv6MR+A/uzw5WaSj2u92W6bB/vmLBCzL39mM=", + "rev": "d85491b0a1dcb82dd8e124a876ecd7e3d50dc5e8", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/ffmpeg": { "args": { - "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8=", - "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2", + "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY=", + "rev": "d2d06b12c22d27af58114e779270521074ff1f85", "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "fetcher": "fetchFromGitiles" @@ -155,24 +147,24 @@ }, "src/third_party/fontconfig/src": { "args": { - "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y=", - "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba", + "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0=", + "rev": "86b48ec01ece451d5270d0c5181a43151e45a042", "url": "https://chromium.googlesource.com/external/fontconfig.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/freetype/src": { "args": { - "hash": "sha256-Mt6uJGGHiGYNNLx2xrooYirynL9DW0s05G1GJiqzhi8=", - "rev": "e07e56c7f106b600262ab653d696b7b57f320127", + "hash": "sha256-oiezGGrPlHVGi24IpLr6UfUs7gT+Epzw37TtAkEixek=", + "rev": "08805be530d6820d2bf8a1b7685826de40f06812", "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/fuzztest/src": { "args": { - "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas=", - "rev": "f03aafb7516050ea73f617bf969f03eac641aefc", + "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk=", + "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66", "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "fetcher": "fetchFromGitiles" @@ -187,24 +179,24 @@ }, "src/third_party/googletest/src": { "args": { - "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0=", - "rev": "09ffd0015395354774c059a17d9f5bee36177ff9", + "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw=", + "rev": "373af2e3df71599b87a40ce0e37164523849166b", "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/grpc/src": { "args": { - "hash": "sha256-z96goSSgBUvTjNse/LO88zNIzg+SWEYgVDaoA/elkLU=", - "rev": "cadf3c8329377e93b1f5e2d6a43d91f7a4becc28", + "hash": "sha256-5vv8V/hEKalfHa2Qo8QIxLvXoamcLxNQ/bcqY8vCvjk=", + "rev": "806e186735cc3bf4375f43d2d6a9483c607e4278", "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/gtest-parallel": { "args": { - "hash": "sha256-VUuk5tBTh+aU2dxVWUF1FePWlKUJaWSiGSXk/J5zgHw=", - "rev": "96f4f904922f9bf66689e749c40f314845baaac8", + "hash": "sha256-uVq+oDrue4sf1JPoeymIIDe79Fv7rcJAVOjxUF42Xo0=", + "rev": "cd488bdedc1d2cffb98201a17afc1b298b0b90f1", "url": "https://chromium.googlesource.com/external/github.com/google/gtest-parallel" }, "fetcher": "fetchFromGitiles" @@ -219,8 +211,8 @@ }, "src/third_party/icu": { "args": { - "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw=", - "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d", + "hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q=", + "rev": "1b2e3e8a421efae36141a7b932b41e315b089af8", "url": "https://chromium.googlesource.com/chromium/deps/icu.git" }, "fetcher": "fetchFromGitiles" @@ -243,32 +235,32 @@ }, "src/third_party/libFuzzer/src": { "args": { - "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=", - "rev": "e31b99917861f891308269c36a32363b120126bb", + "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM=", + "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libaom/source/libaom": { "args": { - "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc=", - "rev": "2cca4aba034f99842c2e6cdc173f83801d289764", + "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo=", + "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226", "url": "https://aomedia.googlesource.com/aom.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libc++/src": { "args": { - "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko=", - "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96", + "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M=", + "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libc++abi/src": { "args": { - "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk=", - "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd", + "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70=", + "rev": "a6c815c69d55ec59d020abde636754d120b402ad", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" }, "fetcher": "fetchFromGitiles" @@ -291,32 +283,32 @@ }, "src/third_party/libunwind/src": { "args": { - "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY=", - "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e", + "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw=", + "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libvpx/source/libvpx": { "args": { - "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4=", - "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf", + "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8=", + "rev": "a985e5e847a2fe69bef3e547cf25088132194e39", "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libyuv": { "args": { - "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c=", - "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591", + "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus=", + "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c", "url": "https://chromium.googlesource.com/libyuv/libyuv.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/llvm-libc/src": { "args": { - "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A=", - "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c", + "hash": "sha256-MgOyCveySgpUoIj6jJGbDjzMVpPDbeKtvpFUC+ocdsY=", + "rev": "8ec6b26421b5fa7aa876fdab486fa1decc558326", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git" }, "fetcher": "fetchFromGitiles" @@ -331,8 +323,8 @@ }, "src/third_party/nasm": { "args": { - "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs=", - "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca", + "hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY=", + "rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2", "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" }, "fetcher": "fetchFromGitiles" @@ -347,8 +339,8 @@ }, "src/third_party/perfetto": { "args": { - "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4=", - "rev": "dd35b295cd359ba094404218414955f961a0d6ae", + "hash": "sha256-JwoqF2VWrkwcokaGY6bo73YJWtO7lDnvOqFCBmIEBXY=", + "rev": "0c893ed6bf6b42e3fee58daf3380d301c72550ed", "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git" }, "fetcher": "fetchFromGitiles" @@ -363,16 +355,16 @@ }, "src/third_party/re2/src": { "args": { - "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=", - "rev": "c84a140c93352cdabbfb547c531be34515b12228", + "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ=", + "rev": "8451125897dd7816a5c118925e8e42309d598ecc", "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" }, "fetcher": "fetchFromGitiles" }, "src/tools": { "args": { - "hash": "sha256-j95oiK5+hhKC+NNQ27EVZugZI/n2QZJNRyz2QE4pVXc=", - "rev": "901b847deda65d44f1bba16a9f47e2ea68a805be", + "hash": "sha256-9CYGP9LI/fSHUAjqvXxyNZZVwxkr5TdEZME4l/7fizM=", + "rev": "ec8f1c6113753a31c55b6d6bddfbe198046029a8", "url": "https://chromium.googlesource.com/chromium/src/tools" }, "fetcher": "fetchFromGitiles" diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix index 2e586d52cb..70958880a3 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc.nix +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -87,6 +87,7 @@ "is_clang=false" "treat_warnings_as_errors=false" "use_llvm_libatomic=false" + "use_custom_libcxx=false" # https://github.com/signalapp/ringrtc/blob/main/bin/build-desktop "rtc_build_examples=false"

Good catch, thanks.

marcin-serwin · 2025-10-15T15:32:29Z

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

@@ -19,16 +19,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ringrtc";
-  version = "2.58.1";
+  version = "2.59.0";


Let's also add validation to prevent version mismatch in the future:

diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index b1cf5cbe46..c3c40bc437 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -30,6 +30,11 @@ cargoHash = "sha256-n+1pe202U2lljisSRBWeVvuBLyp7jhXG+ovDDi5WV8Q="; + preConfigure = '' + # Cehck for matching webrtc version + grep 'webrtc.version=${webrtc.version}' config/version.properties + ''; + cargoBuildFlags = [ "-p" "ringrtc" diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix index 2e586d52cb..efacae7785 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc.nix +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "signal-webrtc"; - version = finalAttrs.gclientDeps."src".path.rev; + version = finalAttrs.gclientDeps."src".path.tag; gclientDeps = gclient2nix.importGclientDeps ./webrtc-sources.json; sourceRoot = "src";

Thanks for the patch, done.

marcin-serwin · 2025-10-15T15:34:33Z

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

@@ -52,13 +52,13 @@ let
    '';
  });

-  version = "7.73.0";
+  version = "7.74.0";


Could you also resolve the TODO in the installPhase? The electron was updated and the flag is no longer necessary:

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 27295d8335..8dd1e2fa65 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -218,12 +218,9 @@ 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=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall

marcin-serwin · 2025-10-16T05:53:43Z

New version is out

marcin-serwin · 2025-10-16T16:08:39Z

pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch

+          .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0"))
+          .join("_")
+      }.png`;
+    return `file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)}`;


There are two issues with the patch: the returned string must now contain the url(...) wrapper and the logic for returning nulls must be removed. The first issue is caused by their refactoring – they wrapped it elsewhere in the code earlier. The second one is caused by the way we patch the css to always rely on the url being present, while the original code uses generated sheets with low resolution emojis as fallback when the url is not present.

Patch

diff --git a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch index feaee2eacff1..4f7f0bebcf26 100644 --- a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch +++ b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch @@ -125,22 +125,28 @@ index ea029fd5b..0e3563b4f 100644 } diff --git a/ts/components/fun/FunEmoji.tsx b/ts/components/fun/FunEmoji.tsx -index ddb30bf6d..0d7a2ebfc 100644 ---- i/ts/components/fun/FunEmoji.tsx -+++ w/ts/components/fun/FunEmoji.tsx -@@ -24,7 +24,14 @@ function getEmojiJumboBackground( - return null; - } - if (KNOWN_JUMBOMOJI.has(emoji.value)) { +index ddb30bf6d..5fc39339b 100644 +--- a/ts/components/fun/FunEmoji.tsx ++++ b/ts/components/fun/FunEmoji.tsx +@@ -20,13 +20,14 @@ function getEmojiJumboBackground( + emoji: EmojiVariantData, + size: number | undefined + ): string | null { +- if (size != null && size < MIN_JUMBOMOJI_SIZE) { +- return null; +- } +- if (KNOWN_JUMBOMOJI.has(emoji.value)) { - return `url(emoji://jumbo?emoji=${encodeURIComponent(emoji.value)})`; -+ const emojiToNotoName = (emoji: string): string => -+ `emoji_u${ -+ [...emoji] -+ .filter(c => c != "\ufe0f") -+ .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0")) -+ .join("_") -+ }.png`; -+ return `file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)}`; - } - return null; +- } +- return null; ++ const emojiToNotoName = (emoji: string): string => ++ `emoji_u${ ++ [...emoji] ++ .filter(c => c != "\ufe0f") ++ .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0")) ++ .join("_") ++ }.png`; ++ return `url(file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)})`; } + + export type FunStaticEmojiSize =

Thanks, applied your patch.

marcin-serwin · 2025-10-16T16:14:58Z

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

    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=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \


I think we should try to delete this line entirely. Electron 38 now respects XDG_SESSION_TYPE so it looks like they deem wayland support mature without any additional flags. I've tried running Signal without them and didn't notice anything to be broken. We can reintroduce them later if someone notices a regression. What do you think?

Suggested change

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

https://peter.sh/experiments/chromium-command-line-switches/

I could not find any fixed bug for window decorations, I would not remove it yet. Here's the PR that introduced the flag for reference: #192659.
https://issues.chromium.org/issues/349089078

Regarding IME, I believe that flag is still useful, PRs that introduced it for reference: #358620 #361341

I'd only agree to remove them IF we can find a source that explains why these flags should no longer be needed. It's still one less flag though 😄

Okay, let's leave it then.

Co-authored-by: Marcin Serwin <marcin@serwin.dev>

Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v7.75.1

marcin-serwin

Diff LGTM and everything seems to be working on aarch64-linux. Thanks for tackling this bump.

marcin-serwin · 2025-10-17T15:25:00Z

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

    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=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \


Okay, let's leave it then.

nixpkgs-ci · 2025-10-23T11:26:45Z

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-25.05
git worktree add -d .worktree/backport-452197-to-release-25.05 origin/release-25.05
cd .worktree/backport-452197-to-release-25.05
git switch --create backport-452197-to-release-25.05
git cherry-pick -x 936aa39307a68f70b824d4807736986139767451 8f53ef33326c5e98d779be598bcaa85ee99fbe42 cdeec81a567f40c5842ac241285231d47fc71c4f

teutat3s added the backport release-25.05 label Oct 15, 2025

nix-owners bot requested a review from marcin-serwin October 15, 2025 09:08

marcin-serwin requested changes Oct 15, 2025

View reviewed changes

teutat3s force-pushed the signal-desktop-7.74.0 branch from 140707f to a0ced02 Compare October 15, 2025 17:09

teutat3s changed the title ~~signal-desktop: 7.73.0 -> 7.74.0~~ signal-desktop: 7.73.0 -> 7.75.0 Oct 16, 2025

teutat3s requested a review from marcin-serwin October 16, 2025 11:35

teutat3s force-pushed the signal-desktop-7.74.0 branch from f86fac7 to 7c726e2 Compare October 16, 2025 11:37

marcin-serwin requested changes Oct 16, 2025

View reviewed changes

teutat3s and others added 2 commits October 17, 2025 12:44

signal-desktop: 7.73.0 -> 7.74.0

936aa39

Co-authored-by: Marcin Serwin <marcin@serwin.dev>

signal-desktop: 7.74.0 -> 7.75.0

8f53ef3

teutat3s force-pushed the signal-desktop-7.74.0 branch from 7c726e2 to 8f53ef3 Compare October 17, 2025 10:44

teutat3s requested a review from marcin-serwin October 17, 2025 10:45

signal-desktop: 7.75.0 -> 7.75.1

cdeec81

Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v7.75.1

teutat3s changed the title ~~signal-desktop: 7.73.0 -> 7.75.0~~ signal-desktop: 7.73.0 -> 7.75.1 Oct 17, 2025

marcin-serwin approved these changes Oct 17, 2025

View reviewed changes

nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Oct 17, 2025

adamcstephens added this pull request to the merge queue Oct 23, 2025

Merged via the queue into NixOS:master with commit cead8a9 Oct 23, 2025
32 of 34 checks passed

teutat3s deleted the signal-desktop-7.74.0 branch October 23, 2025 11:28

teutat3s mentioned this pull request Oct 23, 2025

[25.05] signal-desktop: 7.73.0 -> 7.75.1 #454870

Merged

13 tasks

teutat3s added the 8.has: port to stable This PR already has a backport to the stable release. label Oct 23, 2025

Uh oh!

Conversation

teutat3s commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

Sigmanificient commented Oct 15, 2025

nixpkgs-review result

x86_64-linux

aarch64-linux

Uh oh!

marcin-serwin left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marcin-serwin commented Oct 16, 2025

Uh oh!

marcin-serwin Oct 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marcin-serwin left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nixpkgs-ci bot commented Oct 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

teutat3s commented Oct 15, 2025 •

edited

Loading

`nixpkgs-review` result

`x86_64-linux`

`aarch64-linux`

marcin-serwin Oct 16, 2025 •

edited

Loading