diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-09-05 18:33:56 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-09-23 17:29:56 +0000 |
| commit | b2c7a5a271269175bbcb2907ca821139a7ee465f (patch) | |
| tree | b8359669962114f45a86723b60893970d011183c /pkgs/build-support/bintools-wrapper | |
| parent | 56853dc6d83a861050bbc02041dbe65f7b1b6f63 (diff) | |
| download | nixpkgs-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar nixpkgs-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar.gz nixpkgs-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar.bz2 nixpkgs-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar.lz nixpkgs-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar.xz nixpkgs-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar.zst nixpkgs-b2c7a5a271269175bbcb2907ca821139a7ee465f.zip | |
bintools-wrapper, cc-wrapper, stdenv: infer propagateDoc automatically
02c09e01712ce0b61e5c8f7159047699a434f7fc (NixOS/nixpkgs#44558) was reverted in c981787db951afb11c1328461df82d4277ebec07 but, as it turns out, it fixed an issue I didn't know about at the time: the values of `propagateDoc` options were (and now again are) inconsistent with the underlying things those wrappers wrap (see NixOS/nixpkgs#46119), which was (and now is) likely to produce more instances of NixOS/nixpkgs#43547, if not now, then eventually as stdenv changes. This patch (which is a simplified version of the original reverted patch) is the simplest solution to this whole thing: it forces wrappers to directly inspect the outputs of the things they are wrapping instead of making stdenv guess the correct values.
Diffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 7948f726c62..f9ca245beea 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -6,9 +6,10 @@ # compiler and the linker just "work". { name ? "" -, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, bintools ? null, libc ? null -, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null +, stdenvNoCC +, bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null +, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +, propagateDoc ? bintools != null && bintools ? man , extraPackages ? [], extraBuildCommands ? "" , buildPackages ? {} , useMacosReexportHack ? false |