diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2022-01-27 12:53:29 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2022-01-27 12:53:29 +0100 |
| commit | 6b9ef93b98c053ef6390ef96092b3b302773a4aa (patch) | |
| tree | 6597dddf686ccf599c1987b9795ec999b9f68dc0 | |
| parent | aa877346f8cf9a12da8402d5f7e2097b8136890c (diff) | |
| download | nixpkgs-6b9ef93b98c053ef6390ef96092b3b302773a4aa.tar nixpkgs-6b9ef93b98c053ef6390ef96092b3b302773a4aa.tar.gz nixpkgs-6b9ef93b98c053ef6390ef96092b3b302773a4aa.tar.bz2 nixpkgs-6b9ef93b98c053ef6390ef96092b3b302773a4aa.tar.lz nixpkgs-6b9ef93b98c053ef6390ef96092b3b302773a4aa.tar.xz nixpkgs-6b9ef93b98c053ef6390ef96092b3b302773a4aa.tar.zst nixpkgs-6b9ef93b98c053ef6390ef96092b3b302773a4aa.zip | |
Revert "flake.nix: Set nixpkgs.config.path"
This reverts commit 0b222173dba00680074ef9e98a5bad224f62967e.
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/flake.nix b/flake.nix index 39553cde0ab..c2306768d6f 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 14dd1d816db..69967c8a760 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 |