From 6766d3f7c84ee26bfc7eeab4b1446a2fcadf4f5a Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 8 Oct 2019 19:39:10 +0200
Subject: Use nixpkgs as unstable on darwin

Re-installing seems to have changed how nix is installed.
---
 user/modules/emacs.nix   | 2 +-
 user/modules/nixpkgs.nix | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'user')

diff --git a/user/modules/emacs.nix b/user/modules/emacs.nix
index 17c0bf92..091c588c 100644
--- a/user/modules/emacs.nix
+++ b/user/modules/emacs.nix
@@ -3,7 +3,7 @@
 let
   inherit (pkgs) stdenv;
 
-  pkgsUnstable = if stdenv.isDarwin then import <nixpkgs-unstable> {} else import <nixos-unstable> {};
+  pkgsUnstable = if stdenv.isDarwin then import <nixpkgs> {} else import <nixos-unstable> {};
 
   editorScript = pkgs.writeScriptBin "edit" ''
     #!${pkgs.runtimeShell}
diff --git a/user/modules/nixpkgs.nix b/user/modules/nixpkgs.nix
index e0952c9c..b89579e1 100644
--- a/user/modules/nixpkgs.nix
+++ b/user/modules/nixpkgs.nix
@@ -6,9 +6,7 @@
   ];
   nixpkgs.overlays = [
     (self: super: {
-      unstable = import <nixpkgs-unstable> {
-        config = config.nixpkgs.config;
-      };
+      unstable = self;
     })
   ];
 }
-- 
cgit 1.4.1