diff options
author | Robert Hensing <robert@roberthensing.nl> | 2024-03-12 18:39:19 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2024-03-12 18:39:19 +0100 |
commit | 2fb7255cc03e83eb9c860e03218fdf3644208e98 (patch) | |
tree | 4500591d743515eb481b4f03e095a8954c141e78 /pkgs/stdenv | |
parent | 90197b68338ae7bbda084aaec59c74ec130ccf4e (diff) | |
download | nixlib-2fb7255cc03e83eb9c860e03218fdf3644208e98.tar nixlib-2fb7255cc03e83eb9c860e03218fdf3644208e98.tar.gz nixlib-2fb7255cc03e83eb9c860e03218fdf3644208e98.tar.bz2 nixlib-2fb7255cc03e83eb9c860e03218fdf3644208e98.tar.lz nixlib-2fb7255cc03e83eb9c860e03218fdf3644208e98.tar.xz nixlib-2fb7255cc03e83eb9c860e03218fdf3644208e98.tar.zst nixlib-2fb7255cc03e83eb9c860e03218fdf3644208e98.zip |
make-derivation.nix: Evaluate flip
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 659c191262e2..c3230a27b42c 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -18,7 +18,6 @@ let extendDerivation filter findFirst - flip getDev head imap1 @@ -261,10 +260,13 @@ let erroneousHardeningFlags = subtractLists knownHardeningFlags (hardeningEnable ++ remove "all" hardeningDisable); checkDependencyList = checkDependencyList' []; - checkDependencyList' = positions: name: deps: flip imap1 deps (index: dep: - if isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep - else if isList dep then checkDependencyList' ([index] ++ positions) name dep - else throw "Dependency is not of a valid type: ${concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}"); + checkDependencyList' = positions: name: deps: + imap1 + (index: dep: + if isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep + else if isList dep then checkDependencyList' ([index] ++ positions) name dep + else throw "Dependency is not of a valid type: ${concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}") + deps; in if builtins.length erroneousHardeningFlags != 0 then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} { inherit erroneousHardeningFlags hardeningDisable hardeningEnable knownHardeningFlags; |