From fb88a1b8d553ed38c2ff53f0f2dcf8e3f172fae7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 3 Nov 2018 16:45:43 +0100
Subject: fix overlay usage

callPackage automatically re-injects the self dependencies as well so
it's not necessary to keep track of what is in self or super.

Renamed "super" to "pkgs" to favour that train of thoughts.
---
 default.nix | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 7a2fbda..b40ed31 100644
--- a/default.nix
+++ b/default.nix
@@ -1,29 +1,29 @@
-self: super:
+self: pkgs:
 let
 swaypkgs = {
   # patched deps
-  fmt              = self.callPackage ./fmt {};
+  fmt              = pkgs.callPackage ./fmt {};
 
   # wlroots-related
-  wlroots          = self.callPackage ./wlroots {};
-  sway-beta        = self.callPackage ./sway-beta {};
-  grim             = self.callPackage ./grim {};
-  slurp            = self.callPackage ./slurp {};
-  mako             = self.callPackage ./mako {};
-  kanshi           = self.callPackage ./kanshi {};
-  wlstream         = self.callPackage ./wlstream {};
-  oguri            = self.callPackage ./oguri {};
-  waybar           = self.callPackage ./waybar {};
-  wf-config        = self.callPackage ./wf-config {};
-  wayfire          = self.callPackage ./wayfire {};
-  redshift-wayland = self.callPackage ./redshift-wayland {
-    inherit (self.python3Packages) python pygobject3 pyxdg wrapPython;
-    geoclue = self.geoclue2;
+  wlroots          = pkgs.callPackage ./wlroots {};
+  sway-beta        = pkgs.callPackage ./sway-beta {};
+  grim             = pkgs.callPackage ./grim {};
+  slurp            = pkgs.callPackage ./slurp {};
+  mako             = pkgs.callPackage ./mako {};
+  kanshi           = pkgs.callPackage ./kanshi {};
+  wlstream         = pkgs.callPackage ./wlstream {};
+  oguri            = pkgs.callPackage ./oguri {};
+  waybar           = pkgs.callPackage ./waybar {};
+  wf-config        = pkgs.callPackage ./wf-config {};
+  wayfire          = pkgs.callPackage ./wayfire {};
+  redshift-wayland = pkgs.callPackage ./redshift-wayland {
+    inherit (pkgs.python3Packages) python pygobject3 pyxdg wrapPython;
+    geoclue = pkgs.geoclue2;
   };
 
   # i3-related
-  wmfocus          = self.callPackage ./wmfocus {};
-  i3status-rust    = self.callPackage ./i3status-rust {};
+  wmfocus          = pkgs.callPackage ./wmfocus {};
+  i3status-rust    = pkgs.callPackage ./i3status-rust {};
 };
 in
   swaypkgs // { inherit swaypkgs; }
-- 
cgit v1.2.3