Bitlbee and Discord Canary

Signed-off-by: main <magic_rb@redalder.org>

nix/flake.nix

@@ -168,6 +168,7 @@
 
       overlays = {
         bootloadHID = import ./overlays/bootloadHID inputs;
+        bitlbee = import ./overlays/bitlbee;
         hidapitester = import ./overlays/hidapitester inputs;
         emacs = import ./overlays/emacs-ng/default.nix inputs;
         emacsclient-remote = import ./overlays/emacsclient-remote;
@@ -175,7 +176,7 @@
         screenshot = import ./overlays/screenshot;
         easy-hls-nix = import ./overlays/easy-hls-nix inputs.easy-hls-nix;
         mainsail = import ./overlays/mainsail;
-        discord-canary = import "${inputs.yusdacra-dotfiles}/overlays/discord-canary-system.nix";
+        discord-canary = import ./overlays/discord-canary;
         winetricks = import ./overlays/winetricks;
         dwarffs = inputs.dwarffs.overlay;
         deploy-rs = deploy-rs.overlay;
@@ -205,6 +206,7 @@
           in
             {
               bootloadHID = mkPkg "bootloadHID";
+              bitlbee = mkPkg "bitlbee";
               hidapitester = mkPkg "hidapitester";
               emacs = mkPkg "emacs";
               emacsclient-remote = mkPkg "emacsclient-remote";

nix/overlays/bitlbee/default.nix

@@ -0,0 +1,16 @@
+final: prev:
+with final.lib;
+{
+  magic_rb = prev.magic_rb or {} // {
+    bitlbee = (prev.bitlbee.override
+      { enableLibPurple = true;
+        pidgin = prev.pidgin.override
+          { plugins = with prev; [ purple-discord ];
+          };
+      }).overrideAttrs
+      (old:
+        { configureFlags = old.configureFlags ++ singleton "--config=/tmp/bitlbee";
+        }
+      );
+  };
+}

nix/overlays/discord-canary/default.nix

@@ -0,0 +1,31 @@
+final: prev: {
+  discord-canary =
+    prev.discord-canary.overrideAttrs
+    (
+      old: let
+        binaryName = "DiscordCanary";
+      in rec {
+        version = "0.0.123";
+        src =
+          prev.fetchurl
+          {
+            url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
+            sha256 = "0bijwfsd9s4awqkgxd9c2cxh7y5r06vix98qjp0dkv63r6jig8ch";
+          };
+        installPhase = ''
+          mkdir -p $out/{bin,opt/${binaryName},share/pixmaps}
+          mv * $out/opt/${binaryName}
+          chmod +x $out/opt/${binaryName}/${binaryName}
+          patchelf --set-interpreter ${prev.stdenv.cc.bintools.dynamicLinker} \
+              $out/opt/${binaryName}/${binaryName}
+          wrapProgram $out/opt/${binaryName}/${binaryName} \
+              "''${gappsWrapperArgs[@]}" \
+              --prefix XDG_DATA_DIRS : "${prev.gtk3}/share/gsettings-schemas/${prev.gtk3.name}/" \
+              --prefix LD_LIBRARY_PATH : "${old.libPath}:${prev.electron_15}/lib/electron:${prev.libdrm}/lib:${prev.mesa.drivers.out}/lib"
+          ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
+          ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${old.pname}.png
+          ln -s "${old.desktopItem}/share/applications" $out/share/
+        '';
+      }
+    );
+}