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

Commits on Mar 20, 2018

  1. zoom-us: add desktop item

    @kmicklas
    kmicklas authored and Ken Micklas committed Mar 20, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c234c01 View commit details

  2. zoom-us: fix preInstall

    @kmicklas
    kmicklas committed Mar 20, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0e9d1fa View commit details

  3. Merge pull request #37190 from kmicklas/zoom-us-desktop-item 

    zoom-us: add desktop item
    @Ericson2314
    Ericson2314 authored Mar 20, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ec8c3c8 View commit details
Showing with 13 additions and 3 deletions.
  1. +13 −3 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
16 changes: 13 additions & 3 deletions pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, system, makeWrapper,
{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem,
alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:

@@ -59,7 +59,7 @@ in stdenv.mkDerivation {
];

installPhase = ''
$preInstallHooks
runHook preInstall
packagePath=$out/share/zoom-us
mkdir -p $packagePath
@@ -88,9 +88,19 @@ in stdenv.mkDerivation {
Prefix = $packagePath
EOF
$postInstallHooks
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;

meta = {
homepage = https://zoom.us/;
description = "zoom.us video conferencing application";