about summary refs log tree commit diff
path: root/pkgs/stdenv/darwin/default.nix
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2018-09-05 18:33:56 +0000
committerJan Malakhovski <oxij@oxij.org>2018-09-23 17:29:56 +0000
commitb2c7a5a271269175bbcb2907ca821139a7ee465f (patch)
treeb8359669962114f45a86723b60893970d011183c /pkgs/stdenv/darwin/default.nix
parent56853dc6d83a861050bbc02041dbe65f7b1b6f63 (diff)
downloadnixlib-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar
nixlib-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar.gz
nixlib-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar.bz2
nixlib-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar.lz
nixlib-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar.xz
nixlib-b2c7a5a271269175bbcb2907ca821139a7ee465f.tar.zst
nixlib-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/stdenv/darwin/default.nix')
-rw-r--r--pkgs/stdenv/darwin/default.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 6d224e4cc44f..bfeac09ea650 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -88,7 +88,6 @@ in rec {
         extraPackages = lib.optional (libcxx != null) libcxx;
 
         nativeTools  = false;
-        propagateDoc = false;
         nativeLibc   = false;
         inherit buildPackages coreutils gnugrep bintools;
         libc         = last.pkgs.darwin.Libsystem;