From 863cff1fc16e66cf15c2c3d4d83179329611ea97 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 5 Aug 2020 12:15:00 +0200
Subject: Use ripcord derivation from nixos-unstable

---
 user/overlays/extra-packages.nix  |  1 -
 user/packages/ripcord/default.nix | 28 ----------------------------
 user/settings/satoshipay.nix      |  3 ++-
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 user/packages/ripcord/default.nix

diff --git a/user/overlays/extra-packages.nix b/user/overlays/extra-packages.nix
index 552349f4..f077669e 100644
--- a/user/overlays/extra-packages.nix
+++ b/user/overlays/extra-packages.nix
@@ -3,7 +3,6 @@ self: super:
   lumen = super.callPackage ../packages/lumen {
     buildGoPackage = self.buildGo112Package;
   };
-  ripcord = super.callPackage ../packages/ripcord {};
   node2nixPackages = import ../packages/node2nix {
     pkgs = super;
   };
diff --git a/user/packages/ripcord/default.nix b/user/packages/ripcord/default.nix
deleted file mode 100644
index 0cb0ac04..00000000
--- a/user/packages/ripcord/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ pkgs, lib, fetchurl, makeDesktopItem, ... }:
-
-let
-  pname = "ripcord";
-  version = "0.4.24";
-
-  desktopItem = makeDesktopItem {
-    name = "Ripcord";
-    exec = "ripcord";
-    comment = "Desktop chat client for Slack (and Discord)";
-    desktopName = "Ripcord";
-    categories = "Network;InstantMessaging;Chat";
-    genericName = "Team messenger";
-  };
-in
-pkgs.appimageTools.wrapType2 rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage";
-    sha256 = "0rscmnwxvbdl0vfx1pz7x5gxs9qsjk905zmcad4f330j5l5m227z";
-  };
-
-  extraInstallCommands = ''
-    mv $out/bin/{${name},${pname}}
-    ${desktopItem.buildCommand}
-  '';
-}
diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix
index a5910a84..6a1adb70 100644
--- a/user/settings/satoshipay.nix
+++ b/user/settings/satoshipay.nix
@@ -2,6 +2,7 @@
 
 let
   inherit (pkgs) stdenv;
+  unstablePkgs = if !stdenv.isDarwin then import <nixos-unstable> {} else {};
   spGitConfig = {
     user.email = "alan@satoshipay.io";
   };
@@ -36,7 +37,7 @@ in
     docker_compose
 
     redis-desktop-manager
-    ripcord
+    unstablePkgs.ripcord
     robo3t
   ]));
 
-- 
cgit 1.4.1