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/top-level/stage.nix | |
parent | 5189877d348a98c092828211f535dc8365c4dc6e (diff) | |
parent | b60dccbf4f021596913ad595dc43a3dff9f44ad4 (diff) | |
download | nixlib-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar nixlib-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar.gz nixlib-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar.bz2 nixlib-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar.lz nixlib-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar.xz nixlib-dd3aca2d0b9dcb4888779bfb08805d79596607c9.tar.zst nixlib-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/top-level/stage.nix')
-rw-r--r-- | pkgs/top-level/stage.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 4e6531286ee5..1d412a6582cd 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 |