diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-13 17:43:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 17:43:17 -0400 |
| commit | d49d8401ffefd723df62531764136aa3cb5e6392 (patch) | |
| tree | af0425e16e3c6014fff9efbe4d16b96fdb1b53be /pkgs/applications/networking | |
| parent | 84b91899c371fe9336642cb2d7d4990f528ee656 (diff) | |
| parent | 96f52cb22b20d040c3498008b1bcbe75f89a11e9 (diff) | |
| download | nixpkgs-d49d8401ffefd723df62531764136aa3cb5e6392.tar nixpkgs-d49d8401ffefd723df62531764136aa3cb5e6392.tar.gz nixpkgs-d49d8401ffefd723df62531764136aa3cb5e6392.tar.bz2 nixpkgs-d49d8401ffefd723df62531764136aa3cb5e6392.tar.lz nixpkgs-d49d8401ffefd723df62531764136aa3cb5e6392.tar.xz nixpkgs-d49d8401ffefd723df62531764136aa3cb5e6392.tar.zst nixpkgs-d49d8401ffefd723df62531764136aa3cb5e6392.zip | |
Merge pull request #84981 from prusnak/electron-wrapGAppsHook
electron: fix wrapGAppsHook usage
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 70be3698a78..a30df623050 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage -, electron_7, riot-web, gtk3 -, wrapGAppsHook, glib +, electron_7, riot-web }: # Notes for maintainers: # * versions of `riot-web` and `riot-desktop` should be kept in sync. @@ -27,14 +26,7 @@ in mkYarnPackage rec { packageJSON = ./riot-desktop-package.json; yarnNix = ./riot-desktop-yarndeps.nix; - nativeBuildInputs = [ wrapGAppsHook ]; - - extraBuildInputs = [ - glib - gtk3 - ]; - - dontWrapGApps = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' # resources @@ -54,13 +46,10 @@ 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" \ - "''${gappsWrapperArgs[@]}" + --add-flags "$out/share/riot/electron" ''; # Do not attempt generating a tarball for riot-web again. |