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

Commits on Aug 1, 2019

  1. zoom-us: use flathub desktop integration 

    We fetch from https://github.com/flathub/us.zoom.Zoom
and install their appdata, icons, and desktop file.
    @worldofpeace
    worldofpeace committed Aug 1, 2019
    Copy the full SHA
    32f62e9 View commit details

  2. zoom-us: drop uneeded *Inputs

    @worldofpeace
    worldofpeace committed Aug 1, 2019
    Copy the full SHA
    2d30723 View commit details

  3. Merge pull request #65704 from worldofpeace/zoom-us-desktopmetadata 

    zoom-us: use flathub desktop integration
    @worldofpeace
    worldofpeace authored Aug 1, 2019
    Copy the full SHA
    299c2f0 View commit details
Showing with 31 additions and 12 deletions.
  1. +31 −12 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
43 changes: 31 additions & 12 deletions pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, mkDerivation, makeWrapper, makeDesktopItem, autoPatchelfHook
, wrapQtAppsHook
{ stdenv, fetchurl, mkDerivation, autoPatchelfHook
, fetchFromGitHub
# Dynamic libraries
, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative
, qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg
@@ -22,12 +22,20 @@ let
};
};

# Used for icons, appdata, and desktop file.
desktopIntegration = fetchFromGitHub {
owner = "flathub";
repo = "us.zoom.Zoom";
rev = "0d294e1fdd2a4ef4e05d414bc680511f24d835d7";
sha256 = "0rm188844a10v8d6zgl2pnwsliwknawj09b02iabrvjw5w1lp6wl";
};

in mkDerivation {
name = "zoom-us-${version}";

src = srcs.${stdenv.hostPlatform.system};

nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ];
nativeBuildInputs = [ autoPatchelfHook ];

buildInputs = [
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo
@@ -66,15 +74,26 @@ in mkDerivation {
runHook postInstall
'';

postInstall = (makeDesktopItem {
name = "zoom-us";
exec = "$out/bin/zoom-us %U";
icon = "$out/share/zoom-us/application-x-zoom.png";
desktopName = "Zoom";
genericName = "Video Conference";
categories = "Network;Application;";
mimeType = "x-scheme-handler/zoommtg;";
}).buildCommand + ''
postInstall = ''
mkdir -p $out/share/{applications,appdata,icons}
# Desktop File
cp ${desktopIntegration}/us.zoom.Zoom.desktop $out/share/applications
substituteInPlace $out/share/applications/us.zoom.Zoom.desktop \
--replace "Exec=zoom" "Exec=$out/bin/zoom-us"
# Appdata
cp ${desktopIntegration}/us.zoom.Zoom.appdata.xml $out/share/appdata
# Icons
for icon_size in 64 96 128 256; do
path=$icon_size'x'$icon_size
icon=${desktopIntegration}/us.zoom.Zoom.$icon_size.png
mkdir -p $out/share/icons/hicolor/$path/apps
cp $icon $out/share/icons/hicolor/$path/apps/us.zoom.Zoom.png
done
ln -s $out/share/zoom-us/zoom $out/bin/zoom-us
'';