lib: introduce config

infinisil · Sep 7, 2018 · 8fccd88 · 8fccd88
1 parent 965e52d
commit 8fccd88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/default.nix b/lib/default.nix
@@ -11,6 +11,12 @@ let
     callLibs = file: import file { lib = self; };
   in with self; {
 
+    # Configuration of lib, can be set by doing
+    #   lib.extend (self: super: { config = ...; })
+    # One can get this value through lib.config
+    # The Nixpkgs configuration will be passed like this
+    config = {};
+
     # often used, or depending on very little
     trivial = callLibs ./trivial.nix;
     fixedPoints = callLibs ./fixed-points.nix;

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
@@ -43,7 +43,6 @@ let # Rename the function arguments
   crossSystem0 = crossSystem;
 
 in let
-  lib = import ../../lib;
 
   # Allow both:
   # { /* the config */ } and
@@ -53,6 +52,10 @@ in let
     then configExpr { inherit pkgs; }
     else configExpr;
 
+  lib = (import ../../lib).extend (self: super: {
+    inherit config;
+  });
+
   # From a minimum of `system` or `config` (actually a target triple, *not*
   # nixpkgs configuration), infer the other one and platform as needed.
   localSystem = lib.systems.elaborate (