diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-08 12:01:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 12:01:27 +0000 |
| commit | 5ed67a849a330deacc7da8062abac11f617fd0b9 (patch) | |
| tree | c024365c17a2423fd6d6e5ebdcc9a0fad5f3a355 /pkgs/build-support | |
| parent | ad1de317ad42079d7be7566594f6a84e11848e46 (diff) | |
| parent | 087513bc11ed548a98587a7ac6b69472e3323231 (diff) | |
| download | nixpkgs-5ed67a849a330deacc7da8062abac11f617fd0b9.tar nixpkgs-5ed67a849a330deacc7da8062abac11f617fd0b9.tar.gz nixpkgs-5ed67a849a330deacc7da8062abac11f617fd0b9.tar.bz2 nixpkgs-5ed67a849a330deacc7da8062abac11f617fd0b9.tar.lz nixpkgs-5ed67a849a330deacc7da8062abac11f617fd0b9.tar.xz nixpkgs-5ed67a849a330deacc7da8062abac11f617fd0b9.tar.zst nixpkgs-5ed67a849a330deacc7da8062abac11f617fd0b9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/mkshell/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index 7ca4cc23c1d..f85a11394cb 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -14,8 +14,9 @@ , ... }@attrs: let - mergeInputs = name: lib.concatLists (lib.catAttrs name - ([ attrs ] ++ inputsFrom)); + mergeInputs = name: + (attrs.${name} or []) ++ + (lib.subtractLists inputsFrom (lib.catAttrs name inputsFrom)); rest = builtins.removeAttrs attrs [ "packages" |