Skip to content

[release-25.05] signal-desktop.webrtc: use gn_2233 to unbreak #419048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emilylange merged 2 commits into from
Jun 22, 2025
Merged

[release-25.05] signal-desktop.webrtc: use gn_2233 to unbreak #419048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4a1a0c
gn_2233: init
marcin-serwin Jun 22, 2025
899cd21
signal-desktop.webrtc: use gn_2233 to unbreak
marcin-serwin Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkgs/by-name/gn/gn/2233.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{ callPackage, ... }@args:

# Do not update this pinned version!
# Update ./package.nix instead or init an entirely new version based on this.
callPackage ./generic.nix args {
rev = "85cc21e94af590a267c1c7a47020d9b420f8a033";
revNum = "2233";
version = "2025-04-28";
sha256 = "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI=";
}
5 changes: 4 additions & 1 deletion pkgs/by-name/gn/gn/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ stdenv.mkDerivation {
inherit rev sha256;
};

patches = [
patches = lib.optionals (lib.versionOlder revNum "2233") [
(fetchpatch {
name = "LFS64.patch";
url = "https://gn.googlesource.com/gn/+/b5ff50936a726ff3c8d4dfe2a0ae120e6ce1350d%5E%21/?format=TEXT";
Expand All @@ -58,6 +58,9 @@ stdenv.mkDerivation {
];

env.NIX_CFLAGS_COMPILE = "-Wno-error";
# Relax hardening as otherwise gn unstable 2024-06-06 and later fail with:
# cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
${if (lib.versionAtLeast revNum "2233") then "hardeningDisable" else null} = [ "format" ];

buildPhase = ''
python build/gen.py --no-last-commit-position
Expand Down
4 changes: 3 additions & 1 deletion pkgs/by-name/si/signal-desktop/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
nodejs_22,
pnpm_10,
electron_36,
gn_2233,
python3,
makeWrapper,
callPackage,
Expand All @@ -20,11 +21,12 @@ let
nodejs = nodejs_22;
pnpm = pnpm_10.override { inherit nodejs; };
electron = electron_36;
gn = gn_2233;

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

webrtc = callPackage ./webrtc.nix { };
webrtc = callPackage ./webrtc.nix { inherit gn; };
ringrtc = callPackage ./ringrtc.nix { inherit webrtc; };

# Noto Color Emoji PNG files for emoji replacement; see below.
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7398,6 +7398,8 @@ with pkgs;

m4 = gnum4;

gn_2233 = callPackage ../by-name/gn/gn/2233.nix { };

gnumake = callPackage ../development/tools/build-managers/gnumake { };
gradle-packages = import ../development/tools/build-managers/gradle {
inherit
Expand Down
Loading