Merge pull request #72867 from Evils-Devils/mattermost-filechooser

Mattermost-desktop: 4.2.3 -> 4.3.1
This commit is contained in:
Yannis Koutras 2019-11-06 15:05:06 +01:00 committed by GitHub
commit fc323c26d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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