From 1f8a621d898d656e308e5d47ae7737a359ff62bd Mon Sep 17 00:00:00 2001
From: Lyla Bravo <arqv@protonmail.com>
Date: Mon, 26 Oct 2020 00:57:53 -0300
Subject: [PATCH] Sanitize overlays.

---
 .config/nixpkgs/overlays/kakounePlugins.nix |  2 +-
 .config/nixpkgs/overlays/zig.nix            |  2 +-
 .config/nixpkgs/pkgs/kakounePlugins.nix     | 16 +++++++---------
 .config/nixpkgs/pkgs/zig-master.nix         |  4 +---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.config/nixpkgs/overlays/kakounePlugins.nix b/.config/nixpkgs/overlays/kakounePlugins.nix
index 09f520e..34f97ed 100644
--- a/.config/nixpkgs/overlays/kakounePlugins.nix
+++ b/.config/nixpkgs/overlays/kakounePlugins.nix
@@ -1,4 +1,4 @@
 self: super:
 { # add our own plugins
-  kakounePlugins = super.kakounePlugins // (import ../pkgs/kakounePlugins.nix);
+  kakounePlugins = super.kakounePlugins // (import ../pkgs/kakounePlugins.nix) { pkgs = super.pkgs; };
 }
diff --git a/.config/nixpkgs/overlays/zig.nix b/.config/nixpkgs/overlays/zig.nix
index 4081541..2174d48 100644
--- a/.config/nixpkgs/overlays/zig.nix
+++ b/.config/nixpkgs/overlays/zig.nix
@@ -1,6 +1,6 @@
 self: super:
 {
-  zig-master = import ../pkgs/zig-master.nix;
+  zig-master = import ../pkgs/zig-master.nix { pkgs = super.pkgs; };
   zls = import (super.pkgs.fetchFromGitHub {
     owner = "arqv"; # TODO: change when pull request gets merged
     repo = "zls";
diff --git a/.config/nixpkgs/pkgs/kakounePlugins.nix b/.config/nixpkgs/pkgs/kakounePlugins.nix
index 80c7b1d..6df62c2 100644
--- a/.config/nixpkgs/pkgs/kakounePlugins.nix
+++ b/.config/nixpkgs/pkgs/kakounePlugins.nix
@@ -1,10 +1,8 @@
-with import <nixpkgs> { };
-with lib;
-
+{ pkgs }:
 let
-  kakboard = stdenv.mkDerivation {
+  kakboard = pkgs.stdenvNoCC.mkDerivation {
     name = "kakoune-kakboard";
-    src = fetchFromGitHub {
+    src = pkgs.fetchFromGitHub {
       owner = "lePerdu";
       repo = "kakboard";
       rev = "2f13f5cd99591b76ad5cba230815b80138825120";
@@ -15,9 +13,9 @@ let
       cp kakboard.kak $out/share/kak/autoload/plugins/kakboard.kak
     '';
   };
-  smarttab = stdenv.mkDerivation {
+  smarttab = pkgs.stdenvNoCC.mkDerivation {
     name = "kakoune-smarttab";
-    src = fetchFromGitHub {
+    src = pkgs.fetchFromGitHub {
       owner = "andreyorst";
       repo = "smarttab.kak";
       rev = "e7fe8efd0b91ab8dc1c99c131f138de9b38fd965";
@@ -28,9 +26,9 @@ let
       cp -r rc $out/share/kak/autoload/plugins/smarttab
     '';
   };
-  joule = stdenv.mkDerivation {
+  joule = pkgs.stdenvNoCC.mkDerivation {
     name = "kakoune-joule";
-    src = fetchFromGitHub {
+    src = pkgs.fetchFromGitHub {
       owner = "arqv";
       repo = "joule";
       rev = "88477d2ca675c99fc4845e66f153c4fcfd5a82da";
diff --git a/.config/nixpkgs/pkgs/zig-master.nix b/.config/nixpkgs/pkgs/zig-master.nix
index 8106dc0..6857b8c 100644
--- a/.config/nixpkgs/pkgs/zig-master.nix
+++ b/.config/nixpkgs/pkgs/zig-master.nix
@@ -1,6 +1,4 @@
-with import <nixpkgs> { };
-with lib;
-
+{ pkgs }:
 pkgs.stdenvNoCC.mkDerivation rec {
   name = "zig";
   version = "0.6.0+91a1c20e7";