diff options
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index ed4a0e2d8410..13149c33f1c9 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -153,6 +153,7 @@ let # Weirder stuff that doesn't appear in the documentation? knownVulnerabilities = listOf str; + name = str; version = str; tag = str; updateWalker = bool; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index aef39fedb79c..6c29e6746883 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -201,6 +201,10 @@ rec { # passed to the builder and is not a dependency. But since we # include it in the result, it *is* available to nix-env for queries. meta = { + # `name` above includes cross-compilation cruft (and is under assert), + # lets have a clean always accessible version here. + inherit name; + # If the packager hasn't specified `outputsToInstall`, choose a default, # which is the name of `p.bin or p.out or p`; # if he has specified it, it will be overridden below in `// meta`. |