diff options
author | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:01 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:21 +0000 |
commit | 32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b (patch) | |
tree | fcc3746d350ac20ff693adb7c40f945274e4d2f6 /pkgs/applications/networking/instant-messengers/slack | |
parent | aabb651b23969ea4c901914db6ca34eb2897f7a0 (diff) | |
parent | b5d1d50aa90e0780c57fb4b323203ea5056be857 (diff) |
Merge master into staging
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/slack')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/slack/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 8b74cbc4d9375..e5ebac2b89644 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,12 +1,12 @@ { theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk-pixbuf, libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg, -at-spi2-atk, libuuid +at-spi2-atk, libuuid, nodePackages }: let - version = "3.4.2"; + version = "4.0.0"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -51,7 +51,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0qbj41ymckz8w1p2pazyxg7pimgn9gmpvxz4ygcm0nyivfmw2crq"; + sha256 = "911a4c05fb4f85181df13f013e82440b0d171862c9cb137dc19b6381d47bd57e"; } else throw "Slack is not supported on ${stdenv.hostPlatform.system}"; @@ -66,7 +66,7 @@ in stdenv.mkDerivation { gtk3 # needed for GSETTINGS_SCHEMAS_PATH ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper nodePackages.asar ]; dontUnpack = true; buildCommand = '' @@ -93,18 +93,20 @@ in stdenv.mkDerivation { --replace /usr/bin/ $out/bin/ \ --replace /usr/share/ $out/share/ '' + stdenv.lib.optionalString (theme != null) '' - cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js + asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked + cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js + var fs = require('fs'); document.addEventListener('DOMContentLoaded', function() { - let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}" fs.readFile('${theme}/theme.css', 'utf8', function(err, css) { - \$("<style></style>").appendTo('head').html(css + tt__customCss); - \$("<style></style>").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}'); - \$("<style></style>").appendTo('head').html('.p-channel_sidebar {background: #363636 !important}'); - \$("<style></style>").appendTo('head').html('#client_body:not(.onboarding):not(.feature_global_nav_layout):before {background: inherit;}'); + let s = document.createElement('style'); + s.type = 'text/css'; + s.innerHTML = css; + document.head.appendChild(s); }); }); EOF + asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar ''; meta = with stdenv.lib; { |