ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 06:06:13 +03:00
Code Issues Projects Releases Wiki Activity

stdenv: use lib.isX instead of typeOf Y == X

Browse Source 
more readable
This commit is contained in:
Artturin 2023-06-21 16:11:40 +03:00
parent 3cd360a2de
commit ac031478cb
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/stdenv/generic/make-derivation.nix
View File

@ -214,7 +214,7 @@ let
checkDependencyList = checkDependencyList' []; checkDependencyList = checkDependencyList' [];
checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep: checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep:
if lib.isDerivation dep || dep == null || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep if lib.isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep
else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep
else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}"); else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}");
in if builtins.length erroneousHardeningFlags != 0 in if builtins.length erroneousHardeningFlags != 0