Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7d80362d6c5d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ef955ecb1ea1
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 4, 2020

  1. riot-desktop: add gsettings schemas to the wrapper 

    (cherry picked from commit 1af6a1a)
This fixes a crash when opening the file picker.
    @rnhmjoj
    rnhmjoj committed Apr 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ef955ec View commit details
Showing with 7 additions and 3 deletions.
  1. +7 −3 pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
10 changes: 7 additions & 3 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }:
{ stdenv, fetchFromGitHub
, makeWrapper, makeDesktopItem, mkYarnPackage
, electron_7, riot-web, gtk3,
}:

# Notes for maintainers:
# * versions of `riot-web` and `riot-desktop` should be kept in sync.
@@ -24,7 +27,7 @@ in mkYarnPackage rec {
packageJSON = ./riot-desktop-package.json;
yarnNix = ./riot-desktop-yarndeps.nix;

nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper gtk3 ];

installPhase = ''
# resources
@@ -47,7 +50,8 @@ in mkYarnPackage rec {
# executable wrapper
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/riot/electron"
--add-flags "$out/share/riot/electron" \
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH
'';

# Do not attempt generating a tarball for riot-web again.