From 56a686a07158103fc711795e7569c1bec4bdd4d4 Mon Sep 17 00:00:00 2001
From: Michael Raitza <git@spacefrogg.net>
Date: Sun, 6 Dec 2020 13:30:10 +0100
Subject: [PATCH] Fix overlay definition

---
 default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/default.nix b/default.nix
index 6cdc6f2..03c63b0 100644
--- a/default.nix
+++ b/default.nix
@@ -2,9 +2,9 @@ final: prev:
 with final;
 with final.lib;
 let
-  mapAttrs = super.stdenv.lib.mapAttrs;
-  flip = super.stdenv.lib.flip;
-  callPackage = super.lib.callPackageWith self;
+  mapAttrs = prev.stdenv.lib.mapAttrs;
+  flip = prev.stdenv.lib.flip;
+  callPackage = prev.lib.callPackageWith final;
   _self = {
     xPlaneEnv = callPackage ./x-plane { xplanePathStr = "/home/games/xplane";
       addons = [ headshake beautifulRoads samBasic samGlobalTrees flyWithLua vividSky airportEnvHD betterLights extendedNightLights toLissA321 ]; };
@@ -35,9 +35,9 @@ let
     # Used to run diskover file crawler
     rq = callPackage ./rq { };
 
-    pharo-with-libs = callPackage ./pharo.nix { libgit2_32 = super.pkgsi686Linux.libgit2; };
+    pharo-with-libs = callPackage ./pharo.nix { libgit2_32 = prev.pkgsi686Linux.libgit2; };
 
-    myR = super.rWrapper.override { packages = with super.rPackages; [ ggplot2 lintr tikzDevice rlang ]; };
+    myR = prev.rWrapper.override { packages = with prev.rPackages; [ ggplot2 lintr tikzDevice rlang ]; };
     ledgerTools = callPackage ./ledger-tools { };
   };
 in _self