diff options
| author | Geoff Reedy <geoff@programmer-monk.net> | 2021-09-08 08:54:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 16:54:24 +0200 |
| commit | c524608dca14c8716eaefa88d2aa8c757af48daa (patch) | |
| tree | 51175a31e05d1c92d6084d10aace9bcd821f552c /pkgs/build-support/mkshell/default.nix | |
| parent | 6338963691a3c8693a8a428605dfcb2428a2d540 (diff) | |
| download | nixpkgs-c524608dca14c8716eaefa88d2aa8c757af48daa.tar nixpkgs-c524608dca14c8716eaefa88d2aa8c757af48daa.tar.gz nixpkgs-c524608dca14c8716eaefa88d2aa8c757af48daa.tar.bz2 nixpkgs-c524608dca14c8716eaefa88d2aa8c757af48daa.tar.lz nixpkgs-c524608dca14c8716eaefa88d2aa8c757af48daa.tar.xz nixpkgs-c524608dca14c8716eaefa88d2aa8c757af48daa.tar.zst nixpkgs-c524608dca14c8716eaefa88d2aa8c757af48daa.zip | |
mkshell: small fix for #137005 (#137105)
I somehow accidentally left out the lib.flatten from mergeInputs. Without it, subtractLists won't ever remove anything from the inputs since the inputs will be a list of lists.
Diffstat (limited to 'pkgs/build-support/mkshell/default.nix')
| -rw-r--r-- | pkgs/build-support/mkshell/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index f85a11394cb..27ee7e32262 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -16,7 +16,7 @@ let mergeInputs = name: (attrs.${name} or []) ++ - (lib.subtractLists inputsFrom (lib.catAttrs name inputsFrom)); + (lib.subtractLists inputsFrom (lib.flatten (lib.catAttrs name inputsFrom))); rest = builtins.removeAttrs attrs [ "packages" |