From 09ecde7aa3a992c96fe911d6c355348393c8813c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 23 Jun 2019 13:52:56 -0700 Subject: [PATCH] [NixOS] Remove custom slack derivation --- nixos/configuration.nix | 2 +- nixos/overlays.nix | 1 - nixos/slack.nix | 116 ---------------------------------------- 3 files changed, 1 insertion(+), 118 deletions(-) delete mode 100644 nixos/slack.nix diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 200c733a..1fbf86ef 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -106,7 +106,7 @@ in pulseeffects quassel rxvt_unicode - slack-appindicator + slack simplescreenrecorder spotify termite diff --git a/nixos/overlays.nix b/nixos/overlays.nix index d959fb4f..965cf9ff 100644 --- a/nixos/overlays.nix +++ b/nixos/overlays.nix @@ -19,7 +19,6 @@ self: super: pasystray-appindicator = super.pasystray.overrideAttrs (oldAttrs: rec { buildInputs = oldAttrs.buildInputs ++ [self.libappindicator-gtk3]; }); - slack-appindicator = self.callPackage ./slack.nix { }; customizable-notify-osd = super.notify-osd.overrideAttrs (oldAttrs: rec { version = "0.9.35+16.04.20160415"; baseURI = "https://launchpad.net/~leolik/+archive/leolik"; diff --git a/nixos/slack.nix b/nixos/slack.nix deleted file mode 100644 index de879413..00000000 --- a/nixos/slack.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ darkMode ? false, 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 }: - -let - - version = "3.4.0"; - - rpath = stdenv.lib.makeLibraryPath [ - alsaLib - at-spi2-atk - atk - cairo - cups - curl - dbus - expat - fontconfig - freetype - glib - gnome2.GConf - gdk_pixbuf - gtk3 - pango - libnotify - libxcb - libappindicator-gtk3 - nspr - nss - stdenv.cc.cc - systemd - - xorg.libxkbfile - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libXScrnSaver - ] + ":${stdenv.cc.cc.lib}/lib64"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0ld53gg0dbfpi79lz2sx5br29mlhwkfcypzf3iya4cm75a33hyw5"; - } - else - throw "Slack is not supported on ${stdenv.hostPlatform.system}"; - -in stdenv.mkDerivation { - name = "slack-${version}"; - - inherit src; - - buildInputs = [ - dpkg - gtk3 # needed for GSETTINGS_SCHEMAS_PATH - ]; - - nativeBuildInputs = [ makeWrapper ]; - - unpackPhase = "true"; - buildCommand = '' - mkdir -p $out - dpkg -x $src $out - cp -av $out/usr/* $out - rm -rf $out/etc $out/usr $out/share/lintian - - # Otherwise it looks "suspicious" - chmod -R g-w $out - - for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/lib/slack $file || true - done - - # Replace the broken bin/slack symlink with a startup wrapper - rm $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 \ - --replace /usr/bin/ $out/bin/ \ - --replace /usr/share/ $out/share/ - '' + stdenv.lib.optionalString darkMode '' - cat <> $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: 'https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css', - success: function(css) { - \$("").appendTo('head').html(css + tt__customCss); - \$("").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}'); - \$("").appendTo('head').html('.p-channel_sidebar {background: #363636 !important}'); - \$("").appendTo('head').html('#client_body:not(.onboarding):not(.feature_global_nav_layout):before {background: inherit;}'); - } - }); - }); - EOF - ''; - - meta = with stdenv.lib; { - description = "Desktop client for Slack"; - homepage = https://slack.com; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -}