diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-01-03 15:22:35 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-01-14 13:24:30 +0000 |
commit | fac3d49e486cbca4306f991ed49687ac1230ed89 (patch) | |
tree | 70d576753f8b374a111a68a1896b411fa07584c3 /pkgs/stdenv/generic | |
parent | 50148f06304ba1dce9130f9476a73fc2d955e10e (diff) | |
download | nixlib-fac3d49e486cbca4306f991ed49687ac1230ed89.tar nixlib-fac3d49e486cbca4306f991ed49687ac1230ed89.tar.gz nixlib-fac3d49e486cbca4306f991ed49687ac1230ed89.tar.bz2 nixlib-fac3d49e486cbca4306f991ed49687ac1230ed89.tar.lz nixlib-fac3d49e486cbca4306f991ed49687ac1230ed89.tar.xz nixlib-fac3d49e486cbca4306f991ed49687ac1230ed89.tar.zst nixlib-fac3d49e486cbca4306f991ed49687ac1230ed89.zip |
stdenv: provide `meta.name`
Diffstat (limited to 'pkgs/stdenv/generic')
-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`. |