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

slack: 3.1.0 -> 3.2.0-beta2 (#41051)

Browse Source 
I know this says it's a beta verison, but
  - This is the version they're distributing on slack.com/download for
    linux
  - The previous releases were "beta" too, they just didn't mention
    it in the version string
This commit is contained in:
Benjamin Staffin 2018-05-26 09:40:55 -04:00 committed by xeji
parent b45fde2da5
commit e386e19042
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/networking/instant-messengers/slack/default.nix
View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, dpkg { stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }: , gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
, systemd, wget, xorg }:
let let
version = "3.1.0"; version = "3.2.0-beta25a7a50e";
rpath = stdenv.lib.makeLibraryPath [ rpath = stdenv.lib.makeLibraryPath [
alsaLib alsaLib
@ -17,10 +18,10 @@ let
fontconfig fontconfig
freetype freetype
glib glib
gnome2.GConf gnome3.gconf
gnome2.gdk_pixbuf gdk_pixbuf
gnome2.gtk gtk3
gnome2.pango pango
libnotify libnotify
libxcb libxcb
nspr nspr
@ -46,7 +47,7 @@ let
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
sha256 = "1y8xxfpqvz4q6y1zkna4cp3rqi7p03w5xgr8h1cmym8z66bj7dq3"; sha256 = "0497794a7f0e5ac00a9421e6b1875dcc576ed93efc4a7d8c6465db641c234064";
} }
else else
throw "Slack is not supported on ${stdenv.system}"; throw "Slack is not supported on ${stdenv.system}";
@ -56,7 +57,13 @@ in stdenv.mkDerivation {
inherit src; inherit src;
buildInputs = [ dpkg ]; buildInputs = [
dpkg
gtk3 # needed for GSETTINGS_SCHEMAS_PATH
];
nativeBuildInputs = [ makeWrapper ];
unpackPhase = "true"; unpackPhase = "true";
buildCommand = '' buildCommand = ''
mkdir -p $out mkdir -p $out
@ -72,9 +79,10 @@ in stdenv.mkDerivation {
patchelf --set-rpath ${rpath}:$out/lib/slack $file || true patchelf --set-rpath ${rpath}:$out/lib/slack $file || true
done done
# Fix the symlink # Replace the broken bin/slack symlink with a startup wrapper
rm $out/bin/slack rm $out/bin/slack
ln -s $out/lib/slack/slack $out/bin/slack makeWrapper $out/lib/slack/slack $out/bin/slack \
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH
# Fix the desktop link # Fix the desktop link
substituteInPlace $out/share/applications/slack.desktop \ substituteInPlace $out/share/applications/slack.desktop \