From 4ed53e3b0a999295afbd24a6314827a11e6f1f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 4 Sep 2022 13:23:46 +0200
Subject: [PATCH] Cleanup overlays

---
 overlay/default.nix                   | 12 ++++++------
 overlay/dump1090-influxdb/default.nix |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/overlay/default.nix b/overlay/default.nix
index b90b5c6f..8bd4261b 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -5,19 +5,19 @@ final: prev:
 let
   pkgs-unstable = nixos-unstable.legacyPackages.${prev.system};
 in
-{
-  bmxd = prev.callPackage ./bmxd.nix { };
+with final; {
+  bmxd = callPackage ./bmxd.nix { };
 
-  dump1090-influxdb = import ./dump1090-influxdb { pkgs = prev; };
+  dump1090-influxdb = callPackage ./dump1090-influxdb { };
 
-  dump1090_rs = prev.callPackage ./dump1090_rs.nix { };
+  dump1090_rs = callPackage ./dump1090_rs.nix { };
 
   chromium = prev.chromium.override {
     commandLineArgs = "--enable-features=VaapiVideoEncoder,VaapiVideoDecoder,CanvasOopRasterization --force-dark-mode";
   };
 
   # hydra flake
-  hydra = prev.hydra.overrideAttrs (oldAttrs: with final; {
+  hydra = prev.hydra.overrideAttrs (oldAttrs: {
     patches = oldAttrs.patches or [ ] ++ [
       # gitea webhook support
       (fetchpatch {
@@ -33,7 +33,7 @@ in
   });
 
   # hydra in nixpkgs
-  hydra_unstable = prev.hydra_unstable.overrideAttrs (oldAttrs: with final; {
+  hydra_unstable = prev.hydra_unstable.overrideAttrs (oldAttrs: {
     patches = oldAttrs.patches or [ ] ++ [
       # gitea webhook support
       (fetchpatch {
diff --git a/overlay/dump1090-influxdb/default.nix b/overlay/dump1090-influxdb/default.nix
index 7b4ca5fa..dd310780 100644
--- a/overlay/dump1090-influxdb/default.nix
+++ b/overlay/dump1090-influxdb/default.nix
@@ -1,6 +1,5 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ stdenv, bundlerEnv }:
 
-with pkgs;
 let
   gems = bundlerEnv {
     name = "dump1090-influxdb-gems";