summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--flake.nix4
-rw-r--r--nixos/modules/misc/nixpkgs.nix2
2 files changed, 0 insertions, 6 deletions
diff --git a/flake.nix b/flake.nix
index 39553cde0ab5..c2306768d6fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,10 +48,6 @@
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 14dd1d816dbe..69967c8a7601 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -59,8 +59,6 @@ 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