diff options
author | Benjamin Staffin <benley@gmail.com> | 2018-05-26 09:40:55 -0400 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-26 15:40:55 +0200 |
commit | e386e190420c7d70ce69bb2ca70bd67aed1eda9c (patch) | |
tree | 595edea6ce0c29cd495c4c4b11cb6e0dd61bb12e /pkgs/applications/networking/instant-messengers/slack | |
parent | b45fde2da593751c567c22386aa9391a453aa9db (diff) |
slack: 3.1.0 -> 3.2.0-beta2 (#41051)
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
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/slack')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/slack/default.nix | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index b1339f6a6948c..c39e3ce1a459f 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, dpkg +{ stdenv, fetchurl, dpkg, makeWrapper , 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 - version = "3.1.0"; + version = "3.2.0-beta25a7a50e"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -17,10 +18,10 @@ let fontconfig freetype glib - gnome2.GConf - gnome2.gdk_pixbuf - gnome2.gtk - gnome2.pango + gnome3.gconf + gdk_pixbuf + gtk3 + pango libnotify libxcb nspr @@ -46,7 +47,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1y8xxfpqvz4q6y1zkna4cp3rqi7p03w5xgr8h1cmym8z66bj7dq3"; + sha256 = "0497794a7f0e5ac00a9421e6b1875dcc576ed93efc4a7d8c6465db641c234064"; } else throw "Slack is not supported on ${stdenv.system}"; @@ -56,7 +57,13 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ dpkg ]; + buildInputs = [ + dpkg + gtk3 # needed for GSETTINGS_SCHEMAS_PATH + ]; + + nativeBuildInputs = [ makeWrapper ]; + unpackPhase = "true"; buildCommand = '' mkdir -p $out @@ -72,9 +79,10 @@ in stdenv.mkDerivation { patchelf --set-rpath ${rpath}:$out/lib/slack $file || true done - # Fix the symlink + # Replace the broken bin/slack symlink with a startup wrapper 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 substituteInPlace $out/share/applications/slack.desktop \ |