From efc4a4f62392ee31dbd74c008f5de7162d8add20 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 24 Aug 2020 09:52:20 +0200
Subject: Enable cross-platform use of unstable channel

---
 user/settings/nixpkgs.nix    | 5 +++++
 user/settings/satoshipay.nix | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'user')

diff --git a/user/settings/nixpkgs.nix b/user/settings/nixpkgs.nix
index 364d2020..0463596b 100644
--- a/user/settings/nixpkgs.nix
+++ b/user/settings/nixpkgs.nix
@@ -1,5 +1,9 @@
 { config, pkgs, ... }:
 
+let
+  inherit (pkgs) stdenv;
+  unstablePkgs = if stdenv.isDarwin then import <nixpkgs-unstable> {} else import <nixos-unstable> {};
+in
 {
   imports = [
     ./nix.nix
@@ -8,6 +12,7 @@
     (self: super: {
       firefox-bin-unwrapped = super.firefox-bin-unwrapped.override { systemLocale = "en-GB"; };
       firefox-devedition-bin-unwrapped = super.firefox-devedition-bin-unwrapped.override { systemLocale = "en-GB"; };
+      unstable = unstablePkgs;
     })
   ];
 }
diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix
index 6a1adb70..ac33508b 100644
--- a/user/settings/satoshipay.nix
+++ b/user/settings/satoshipay.nix
@@ -2,7 +2,6 @@
 
 let
   inherit (pkgs) stdenv;
-  unstablePkgs = if !stdenv.isDarwin then import <nixos-unstable> {} else {};
   spGitConfig = {
     user.email = "alan@satoshipay.io";
   };
@@ -37,7 +36,7 @@ in
     docker_compose
 
     redis-desktop-manager
-    unstablePkgs.ripcord
+    unstable.ripcord
     robo3t
   ]));
 
-- 
cgit 1.4.1