Fix overlay definition

master
Michael Raitza 2020-12-06 13:30:10 +01:00
parent 8f92d6eb5b
commit 56a686a071
1 changed files with 5 additions and 5 deletions

View File

@ -2,9 +2,9 @@ final: prev:
with final; with final;
with final.lib; with final.lib;
let let
mapAttrs = super.stdenv.lib.mapAttrs; mapAttrs = prev.stdenv.lib.mapAttrs;
flip = super.stdenv.lib.flip; flip = prev.stdenv.lib.flip;
callPackage = super.lib.callPackageWith self; callPackage = prev.lib.callPackageWith final;
_self = { _self = {
xPlaneEnv = callPackage ./x-plane { xplanePathStr = "/home/games/xplane"; xPlaneEnv = callPackage ./x-plane { xplanePathStr = "/home/games/xplane";
addons = [ headshake beautifulRoads samBasic samGlobalTrees flyWithLua vividSky airportEnvHD betterLights extendedNightLights toLissA321 ]; }; addons = [ headshake beautifulRoads samBasic samGlobalTrees flyWithLua vividSky airportEnvHD betterLights extendedNightLights toLissA321 ]; };
@ -35,9 +35,9 @@ let
# Used to run diskover file crawler # Used to run diskover file crawler
rq = callPackage ./rq { }; 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 { }; ledgerTools = callPackage ./ledger-tools { };
}; };
in _self in _self