diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2018-11-13 09:55:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 09:55:24 +0100 |
| commit | dd3aca2d0b9dcb4888779bfb08805d79596607c9 (patch) | |
| tree | 43b1f614f2520d5ff13dcac6fa0632796b42b4f0 /pkgs | |
| parent | 5189877d348a98c092828211f535dc8365c4dc6e (diff) | |
| parent | b60dccbf4f021596913ad595dc43a3dff9f44ad4 (diff) | |
| download | nixpkgs-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar nixpkgs-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar.gz nixpkgs-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar.bz2 nixpkgs-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar.lz nixpkgs-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar.xz nixpkgs-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar.zst nixpkgs-dd3aca2d0b9dcb4888779bfb08805d79596607c9.zip | |
Merge pull request #49256 from roberth/nixos-nixpkgs-pkgs-use-overlays
NixOS: use overlays when nixpkgs.pkgs is set
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/stage.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7459c1c69ff..ad68a42f3f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22212,7 +22212,7 @@ with pkgs; in myOS.run-nginx - Unlike in plain NixOS, the nixpkgs.config, nixpkgs.overlays and + Unlike in plain NixOS, the nixpkgs.config and nixpkgs.system options will be ignored by default. Instead, nixpkgs.pkgs will have the default value of pkgs as it was constructed right after invoking the nixpkgs function (e.g. the diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 4e6531286ee..1d412a6582c 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -164,7 +164,9 @@ let # preexisting overlays. Prefer to initialize with the right overlays # in one go when calling Nixpkgs, for performance and simplicity. appendOverlays = extraOverlays: - import ./stage.nix (args // { overlays = args.overlays ++ extraOverlays; }); + if extraOverlays == [] + then self + else import ./stage.nix (args // { overlays = args.overlays ++ extraOverlays; }); # Extend the package set with a single overlay. This preserves # preexisting overlays. Prefer to initialize with the right overlays |