Skip to content
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.

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

riot-desktop: 1.5.9 -> 1.5.10 #80648

Merged
merged 1 commit into from Mar 2, 2020
Merged

Conversation

pacien
Copy link
Contributor

@pacien pacien commented Feb 20, 2020

Motivation for this change

Synching with the riot-web update (commit da45483).

Not tested.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Synching with the riot-web update (commit da45483).
@ajs124
Copy link
Member

ajs124 commented Feb 22, 2020

Why don't these just fetch the same source, in the first place?

@pacien
Copy link
Contributor Author

pacien commented Feb 22, 2020

Quoting @ajs124:

Why don't these just fetch the same source, in the first place?

riot-desktop needs some additional files that are not present in the pre-compiled tarball that riot-web uses.

@ajs124
Copy link
Member

ajs124 commented Feb 22, 2020

Which ones? I've been something like running

(self: super: 
  riot-web = compressWeb (super.riot-web.overrideAttrs (oA: {
    installPhase = ''
      […]
    '';
  }));
  riot-desktop = super.riot-desktop.override { inherit (self) riot-web; };
)

for a while now and it seems to be working fine.

@pacien
Copy link
Contributor Author

pacien commented Feb 22, 2020

To clarify: riot-desktop needs both the compiled output of the riot-web package and the files in the electron_app directory from the source repo.

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

LGTM, still runs on NixOS.

@worldofpeace worldofpeace merged commit d23a92e into NixOS:master Mar 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants