From 204d7bc28b864d6cf79317a6ec59190e08890fa0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 4 Apr 2020 17:23:14 -0400
Subject: [PATCH] Revert "riot-desktop: add gsettings schemas to the wrapper"
This reverts commit 1af6a1a1346ea596f766da703ba434d1faee7321.
---
.../instant-messengers/riot/riot-desktop.nix | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index fe518ff4f68..5bb2e4e40a0 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -1,7 +1,4 @@
-{ stdenv, fetchFromGitHub
-, makeWrapper, makeDesktopItem, mkYarnPackage
-, electron_7, riot-web, gtk3,
-}:
+{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }:
# Notes for maintainers:
# * versions of `riot-web` and `riot-desktop` should be kept in sync.
@@ -27,7 +24,7 @@ in mkYarnPackage rec {
packageJSON = ./riot-desktop-package.json;
yarnNix = ./riot-desktop-yarndeps.nix;
- nativeBuildInputs = [ makeWrapper gtk3 ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
# resources
@@ -50,8 +47,7 @@ in mkYarnPackage rec {
# executable wrapper
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
- --add-flags "$out/share/riot/electron" \
- --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH
+ --add-flags "$out/share/riot/electron"
'';
# Do not attempt generating a tarball for riot-web again.