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: 9fa7ee47b773
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a128dd3af8d5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 6, 2020

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

    This reverts commit 1af6a1a.

(cherry picked from commit 204d7bc)
    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    57ecbc5 View commit details

  2. riot-desktop: wrap with wrapGAppsHook 

    wrap as per https://nixos.org/nixpkgs/manual/#sec-language-gnome.

(cherry picked from commit fe6addb)
    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    a128dd3 View commit details
Showing with 13 additions and 4 deletions.
  1. +13 −4 pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
17 changes: 13 additions & 4 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub
, makeWrapper, makeDesktopItem, mkYarnPackage
, electron_7, riot-web, gtk3,
, electron_7, riot-web, gtk3
, wrapGAppsHook, glib
}:

# Notes for maintainers:
# * versions of `riot-web` and `riot-desktop` should be kept in sync.
# * the Yarn dependency expression must be updated with `./update-riot-desktop.sh <git release tag>`
@@ -27,7 +27,14 @@ in mkYarnPackage rec {
packageJSON = ./riot-desktop-package.json;
yarnNix = ./riot-desktop-yarndeps.nix;

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

extraBuildInputs = [
glib
gtk3
];

dontWrapGApps = true;

installPhase = ''
# resources
@@ -47,11 +54,13 @@ in mkYarnPackage rec {
# desktop item
mkdir -p "$out/share"
ln -s "${desktopItem}/share/applications" "$out/share/applications"
'';

postFixup = ''
# executable wrapper
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/riot/electron" \
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH
"''${gappsWrapperArgs[@]}"
'';

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