From 41e39deaecc059bc6f619717f61c7fafb84c78ac Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Tue, 26 Nov 2019 15:24:29 +0100
Subject: [PATCH] Simplify return value of modules/default.nix

---
 modules/default.nix | 6 ++----
 pkgs/default.nix    | 7 +++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/default.nix b/modules/default.nix
index 114aeaf..f6a3ee5 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -31,9 +31,7 @@ let
     else showWarnings rawModule.config.warnings rawModule;
 in
 
-if initialBuild
-then module.config
-else {
+{
   inherit (module.config.build) activationPackage;
-  inherit (module.config.environment) path;
+  inherit (module) config;
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 0be3a2d..4d04697 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -8,7 +8,7 @@ let
 
   nixpkgs = loadNixpkgs { };
 
-  config = import ../modules {
+  modules = import ../modules {
     pkgs = nixpkgs;
     initialBuild = true;
 
@@ -29,7 +29,10 @@ let
   };
 
   callPackage = nixpkgs.lib.callPackageWith (
-    nixpkgs // customPkgs // { inherit callPackage config; }
+    nixpkgs // customPkgs // {
+      inherit (modules) config;
+      inherit callPackage;
+    }
   );
 
   customPkgs = rec {