public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56289 from jokogr/u/mattermost-desktop-4.2.0

Browse Source 
mattermost-desktop: 4.1.2 -> 4.2.0
This commit is contained in:
worldofpeace 2019-02-26 01:59:43 -05:00 committed by GitHub
commit 28cb3f4afe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -2294,6 +2294,11 @@
joko = { joko = {
email = "ioannis.koutras@gmail.com"; email = "ioannis.koutras@gmail.com";
github = "jokogr"; github = "jokogr";
keys = [{
# compare with https://keybase.io/joko
longkeyid = "rsa2048/0x85EAE7D9DF56C5CA";
fingerprint = "B154 A8F9 0610 DB45 0CA8 CF39 85EA E7D9 DF56 C5CA";
}];
name = "Ioannis Koutras"; name = "Ioannis Koutras";
}; };
jonafato = { jonafato = {

49
pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, lib, fetchurl, gnome2, gtk2, pango, atk, cairo, gdk_pixbuf, glib, { stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk_pixbuf, glib,
freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage,
libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst,
libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }: libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }:
let let
rpath = lib.makeLibraryPath [ rpath = stdenv.lib.makeLibraryPath [
alsaLib alsaLib
atk atk
cairo cairo
@ -15,7 +15,7 @@ let
gdk_pixbuf gdk_pixbuf
glib glib
gnome2.GConf gnome2.GConf
gtk2 gtk3
pango pango
libX11 libX11
libXScrnSaver libXScrnSaver
@ -38,44 +38,51 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mattermost-desktop-${version}"; name = "mattermost-desktop-${version}";
version = "4.1.2"; version = "4.2.0";
src = src =
if stdenv.hostPlatform.system == "x86_64-linux" then if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz"; url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz";
sha256 = "16dn6870bs1nfl2082ym9gwvmqb3i5sli48qprap80p7riph6k9s"; sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6";
} }
else if stdenv.hostPlatform.system == "i686-linux" then else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl { fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz"; url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz";
sha256 = "145zb1l37fa2slfrrlprlwzcc5km3plxs374yhgix25mlg2afkqr"; sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80";
} }
else else
throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}";
phases = [ "unpackPhase" "installPhase" ]; dontBuild = true;
dontConfigure = true;
dontPatchELF = true;
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out/share/mattermost-desktop
cp -R . $out cp -R . $out/share/mattermost-desktop
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ mkdir -p "$out/bin"
--set-rpath ${rpath}:$out $out/mattermost-desktop ln -s $out/share/mattermost-desktop/mattermost-desktop \
$out/bin/mattermost-desktop
patchShebangs $out/create_desktop_file.sh patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh
$out/create_desktop_file.sh $out/share/mattermost-desktop/create_desktop_file.sh
rm $out/share/mattermost-desktop/create_desktop_file.sh
mkdir -p $out/share/applications
mv Mattermost.desktop $out/share/applications/Mattermost.desktop
mkdir -p $out/{bin,share/applications} patchelf \
cp Mattermost.desktop $out/share/applications/Mattermost.desktop --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
ln -s $out/mattermost-desktop $out/bin/mattermost-desktop --set-rpath "${rpath}:$out/share/mattermost-desktop" \
$out/share/mattermost-desktop/mattermost-desktop
''; '';
meta = { meta = with stdenv.lib; {
description = "Mattermost Desktop client"; description = "Mattermost Desktop client";
homepage = https://about.mattermost.com/; homepage = https://about.mattermost.com/;
license = lib.licenses.asl20; license = licenses.asl20;
platforms = [ platforms = [ "x86_64-linux" "i686-linux" ];
"x86_64-linux" "i686-linux" maintainers = [ maintainers.joko ];
];
}; };
} }