Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'

2 files changed, 26 insertions, 6 deletions

diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
new file mode 100644
index 000000000000..11e2e5baed87
--- /dev/null
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+let
+  rev = "56d2007b5ba9f1628a44af6edf5dbdf74cf92278";
+  sha256 = "1v264mpf9ddiz8zb7fcyjwy1a2yr5f4xs520gf63kl9378v721da";
+  version = "2019-03-15";
+in stdenv.mkDerivation {
+  inherit version;
+
+  name = "slack-theme-black";
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/laCour/slack-night-mode/${rev}/css/raw/black.css";
+    inherit sha256;
+  };
+
+  unpackPhase = "true";
+
+  buildCommand = ''
+    mkdir $out
+    cp $src $out/theme.css
+  '';
+}
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
index a48cd2cad0fb..bd1a39565592 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,9 +1,7 @@
-{ stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
+{ 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,
-darkMode ? false,
-darkModeCssUrl ? "https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css"
+at-spi2-atk, libuuid
 }:
 
 let
@@ -94,12 +92,12 @@ in stdenv.mkDerivation {
     substituteInPlace $out/share/applications/slack.desktop \
       --replace /usr/bin/ $out/bin/ \
       --replace /usr/share/ $out/share/
-  '' + stdenv.lib.optionalString darkMode ''
+  '' + stdenv.lib.optionalString (theme != null) ''
     cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js
     document.addEventListener('DOMContentLoaded', function() {
     let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}"
     $.ajax({
-        url: '${darkModeCssUrl}',
+        url: '${theme}/theme.css',
         success: function(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}');