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 | 50148f06304ba1dce9130f9476a73fc2d955e10e (patch) | |
tree | 3bbed2a377a3c7bf6d1be0611dd4c0fefddf242a /pkgs/stdenv | |
parent | eaee2a119916b2761d08cb8f68f1b4afbde15e51 (diff) | |
download | nixlib-50148f06304ba1dce9130f9476a73fc2d955e10e.tar nixlib-50148f06304ba1dce9130f9476a73fc2d955e10e.tar.gz nixlib-50148f06304ba1dce9130f9476a73fc2d955e10e.tar.bz2 nixlib-50148f06304ba1dce9130f9476a73fc2d955e10e.tar.lz nixlib-50148f06304ba1dce9130f9476a73fc2d955e10e.tar.xz nixlib-50148f06304ba1dce9130f9476a73fc2d955e10e.tar.zst nixlib-50148f06304ba1dce9130f9476a73fc2d955e10e.zip |
stdenv: hide `name` under `check-meta` assert
This is a temporary workaround to make `nix-env -qa` and `nix search` ignore broken packages as they they did before this patchset. This patch should be reverted after `nix` gets a proper fix for this. See NixOS/nix#1771.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index ab5edfcd17c0..aef39fedb79c 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -134,9 +134,12 @@ rec { (lib.concatLists propagatedDependencies)); in { - name = name + lib.optionalString + # A hack to make `nix-env -qa` and `nix search` ignore broken packages. + # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix. + name = assert validity.handled; name + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ("-" + stdenv.hostPlatform.config); + builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; inherit stdenv; |