From 1f314278629729fe6ece82dae26d3a405639bcae Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 21 Apr 2018 13:27:57 +0200
Subject: use nixpkgs overlays

---
 nix/default.nix | 20 ++++++++------------
 nix/module.nix  |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'nix')

diff --git a/nix/default.nix b/nix/default.nix
index 147aed1..dc225a3 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -1,13 +1,9 @@
-pkgs:
+self: super:
 
-let
-  callPackage = pkgs.lib.callPackageWith (pkgs // self);
-
-  self = {
-    cliparg = callPackage ./cliparg.nix {};
-    rebuild-system = callPackage ./rebuild-system.nix {};
-    pulseaudio-ctl = callPackage ./pulseaudio-ctl.nix {};
-    monitor-uucp = callPackage ./monitor-uucp.nix {};
-    rolling-directory = callPackage ./rolling-directory.nix {};
-  };
-in self
+{
+  cliparg = self.callPackage ./cliparg.nix {};
+  rebuild-system = self.callPackage ./rebuild-system.nix {};
+  pulseaudio-ctl = self.callPackage ./pulseaudio-ctl.nix {};
+  monitor-uucp = self.callPackage ./monitor-uucp.nix {};
+  rolling-directory = self.callPackage ./rolling-directory.nix {};
+}
diff --git a/nix/module.nix b/nix/module.nix
index 7d47e1a..123910a 100644
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -48,7 +48,7 @@ in {
   };
 
   config = {
-    nixpkgs.config.packageOverrides = import ./default.nix;
+    nixpkgs.config.overlays = [ (import ./default.nix) ];
 
     systemd.services = listToAttrs (map dirService config.services.rollingDirectories);
   };
-- 
cgit v1.2.3