Skip to content

Commit

Permalink
Revert "riot-desktop: add gsettings schemas to the wrapper"
Browse files Browse the repository at this point in the history
  • Loading branch information
worldofpeace committed Apr 4, 2020
1 parent 90e09e1 commit 556d6d7
Showing 1 changed file with 3 additions and 7 deletions.
@@ -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.
Expand All @@ -27,7 +24,7 @@ in mkYarnPackage rec {
packageJSON = ./riot-desktop-package.json;
yarnNix = ./riot-desktop-yarndeps.nix;

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

installPhase = ''
# resources
Expand All @@ -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.
Expand Down

0 comments on commit 556d6d7

Please sign in to comment.