public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 1af6a1a134.
This commit is contained in:
worldofpeace 2020-04-04 17:23:14 -04:00
parent 90e09e1f0f
commit 204d7bc28b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View File

@ -1,7 +1,4 @@
{ stdenv, fetchFromGitHub { pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }:
, makeWrapper, makeDesktopItem, mkYarnPackage
, electron_7, riot-web, gtk3,
}:
# Notes for maintainers: # Notes for maintainers:
# * versions of `riot-web` and `riot-desktop` should be kept in sync. # * versions of `riot-web` and `riot-desktop` should be kept in sync.
@ -27,7 +24,7 @@ in mkYarnPackage rec {
packageJSON = ./riot-desktop-package.json; packageJSON = ./riot-desktop-package.json;
yarnNix = ./riot-desktop-yarndeps.nix; yarnNix = ./riot-desktop-yarndeps.nix;
nativeBuildInputs = [ makeWrapper gtk3 ]; nativeBuildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
# resources # resources
@ -50,8 +47,7 @@ in mkYarnPackage rec {
# executable wrapper # executable wrapper
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ 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. # Do not attempt generating a tarball for riot-web again.