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

Commits on Mar 30, 2020

  1. mattermost-desktop: fix filechooser causing crash 

    (cherry picked from commit 645a6fd)
    @evils @veprbl
    evils authored and veprbl committed Mar 30, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    epiteff
    GPG key ID: 94F82827CA03B374
    Verified
    Learn about vigilant mode
    Copy the full SHA
    58dec78 View commit details

  2. mattermost-desktop: version 4.2.3 -> 4.3.1 

    (cherry picked from commit f41b8aa)
    @evils @veprbl
    evils authored and veprbl committed Mar 30, 2020
    Copy the full SHA
    6d445f8 View commit details
Showing with 11 additions and 4 deletions.
  1. +11 −4 pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
15 changes: 11 additions & 4 deletions pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib,
freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage,
libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst,
libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }:
libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev, wrapGAppsHook,
hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }:

let
rpath = stdenv.lib.makeLibraryPath [
alsaLib
at-spi2-atk
at-spi2-core
atk
cairo
cups
@@ -17,6 +21,7 @@ let
gnome2.GConf
gtk3
pango
libuuid
libX11
libXScrnSaver
libXcomposite
@@ -38,18 +43,18 @@ let
in
stdenv.mkDerivation rec {
pname = "mattermost-desktop";
version = "4.2.3";
version = "4.3.1";

src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
sha256 = "14xyn8dp0xxl4j9xdsjik9p6srqdxbirgcgym2sv64p01w3kc9wf";
sha256 = "076nv5h6xscbw1987az00x493qhqgrli87gnn57zbvz0acgvlhfv";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz";
sha256 = "063rrxw76mjz71wp9xd3ppkq3s017vrzms879r2cilypmay7fhgs";
sha256 = "19ps9g8j6kp4haj6r3yfy4ma2wm6isq5fa8zlcz6g042ajkqq0ij";
}
else
throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}";
@@ -58,6 +63,8 @@ in
dontConfigure = true;
dontPatchELF = true;

buildInputs = [ wrapGAppsHook gtk3 hicolor-icon-theme ];

installPhase = ''
mkdir -p $out/share/mattermost-desktop
cp -R . $out/share/mattermost-desktop