From 0b222173dba00680074ef9e98a5bad224f62967e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 5 Jan 2022 17:31:16 +0100
Subject: flake.nix: Set nixpkgs.config.path

---
 flake.nix                      | 4 ++++
 nixos/modules/misc/nixpkgs.nix | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/flake.nix b/flake.nix
index c2306768d6f..39553cde0ab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,6 +48,10 @@
                   system.nixos.versionSuffix =
                     ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
                   system.nixos.revision = final.mkIf (self ? rev) self.rev;
+
+                  # NOTE: This assumes that `nixpkgs.config` is _not_ used when
+                  #       nixpkgs.pkgs is set OR _module.args.pkgs is set.
+                  nixpkgs.config.path = self.outPath;
                 }
               ];
           });
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 69967c8a760..14dd1d816db 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -59,6 +59,8 @@ let
     inherit (cfg) config overlays localSystem crossSystem;
   };
 
+  # NOTE: flake.nix assumes that nixpkgs.config is only used with ../../..
+  #       as nixpkgs.config.path should be equivalent to ../../..
   finalPkgs = if opt.pkgs.isDefined then cfg.pkgs.appendOverlays cfg.overlays else defaultPkgs;
 
 in
-- 
cgit 1.4.1