Skip to content

signal-desktop: add commandLineArgs for persistent flags#404989

Merged
pbsds merged 1 commit intoNixOS:masterfrom
dvishal485:signal-desktop-args-support
Jun 6, 2025
Merged

signal-desktop: add commandLineArgs for persistent flags#404989
pbsds merged 1 commit intoNixOS:masterfrom
dvishal485:signal-desktop-args-support

Conversation

@dvishal485
Copy link
Member

Added commandLineArgs in arguments and pass it to signal-desktop make wrapper to allow custom flags (usually electron related) as practiced in https://github.com/NixOS/nixpkgs/blob/3730d8a308f94996a9ba7c7138ede69c1b9ac4ae/pkgs/by-name/go/google-chrome/package.nix

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@dvishal485 dvishal485 requested a review from marcin-serwin May 7, 2025 17:27
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 7, 2025
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 8, 2025
@teutat3s teutat3s self-requested a review May 8, 2025 18:47
@dvishal485
Copy link
Member Author

Hey @teutat3s, can you get this reviewed and merged?

@teutat3s teutat3s added 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels May 13, 2025
--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-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--add-flags ${lib.escapeShellArg commandLineArgs}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it make more sense to use optionalString to avoid adding an extra --add-flags when there's nothing to add?

@teutat3s teutat3s added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels May 18, 2025
@pbsds pbsds merged commit 6ad174a into NixOS:master Jun 6, 2025
32 checks passed
@dvishal485 dvishal485 deleted the signal-desktop-args-support branch June 10, 2025 13:23
@Gliczy Gliczy mentioned this pull request Jun 19, 2025
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants