nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkshell: small fix for #137005 (#137105)

Browse Source 
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.
This commit is contained in:
Geoff Reedy 2021-09-08 08:54:24 -06:00 committed by GitHub
parent 6338963691
commit c524608dca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/mkshell/default.nix
View File

@ -16,7 +16,7 @@
let let
mergeInputs = name: mergeInputs = name:
(attrs.${name} or []) ++ (attrs.${name} or []) ++
(lib.subtractLists inputsFrom (lib.catAttrs name inputsFrom)); (lib.subtractLists inputsFrom (lib.flatten (lib.catAttrs name inputsFrom)));
rest = builtins.removeAttrs attrs [ rest = builtins.removeAttrs attrs [
"packages" "packages"