From b14b103012d57cd36da2ed4cb45eb95c9d13702d Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 2 Aug 2020 15:05:33 -0400
Subject: [PATCH] Improve overlay lib functions some more.

---
 distros/default.nix | 2 +-
 lib/default.nix     | 8 +++++++-
 lib/mk-overlay.nix  | 9 ---------
 overlay.nix         | 5 ++---
 pkgs/default.nix    | 2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 lib/mk-overlay.nix

diff --git a/distros/default.nix b/distros/default.nix
index c646609b87..a15e0d528f 100644
--- a/distros/default.nix
+++ b/distros/default.nix
@@ -2,7 +2,7 @@
 
 self: super: {
   rosPackages = rec {
-    lib = super.lib // import ../lib { inherit self; };
+    lib = super.lib // import ../lib { inherit lib self; };
 
     kinetic = import ./distro-overlay.nix {
       distro = "kinetic";
diff --git a/lib/default.nix b/lib/default.nix
index 3abc022faf..3bca3dfb6a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -3,6 +3,12 @@
 , rosSelf ? null }:
 with lib;
 {
+  mergeOverlays = foldr composeExtensions (_: _: {});
+
+  mkOverlay = overlays: let
+    s = mergeOverlays overlays s {};
+  in s;
+
   patchVendorUrl = pkg: {
     url, sha256,
     originalUrl ? url,
@@ -52,4 +58,4 @@ with lib;
       sed -i '/find_package(Boost [^)]*/s/signals//g' CMakeLists.txt
     '' + postPatch;
   });
-} // (import ./mk-overlay.nix { inherit lib; })
+}
diff --git a/lib/mk-overlay.nix b/lib/mk-overlay.nix
deleted file mode 100644
index 44644fb69b..0000000000
--- a/lib/mk-overlay.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ lib }:
-with lib;
-rec {
-  mergeOverlays = foldr composeExtensions (_: _: {});
-
-  mkOverlay = overlays: let
-    self = mergeOverlays overlays self {};
-  in self;
-}
diff --git a/overlay.nix b/overlay.nix
index 7848ece33d..081f4423a1 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,6 +1,5 @@
-self: super:
-with import ./lib/mk-overlay.nix { inherit (super) lib; };
-mergeOverlays [
+self: super: with super.lib;
+foldr composeExtensions (_: _: {}) [
   (import ./pkgs)
   (import ./distros)
 ] self super
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 0e0e70fefb..7ca3e97f28 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -3,7 +3,7 @@ self: super: with super.lib; let
   pythonOverridesFor = python: python.override (old: {
     packageOverrides = pySelf: pySuper: {
       bson = pySelf.callPackage ./bson { };
-    
+
       catkin-pkg = pySelf.callPackage ./catkin-pkg { };
 
       colcon-cmake = pySelf.callPackage ./colcon/cmake.nix { };