diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-06-17 18:23:25 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-06-17 18:23:25 +0200 |
commit | 5ffd19ddbfdb7e04b3e0cebc8aad56153bedf2d0 (patch) | |
tree | 10f114bb2373fe964566c4260bcc12d20eac334c /pkgs/stdenv | |
parent | db6071802781e8fcf7a70b84a65698f0655d60e2 (diff) | |
parent | 088b29159d2e14a6e722cdc2a8204af7b3118b76 (diff) |
Merge #175785: libidn2: hack to avoid referencing bootstrap tools
...into staging
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d625ab5b30132..6475d7f2ca1e1 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -436,8 +436,16 @@ in inherit (prevStage) gzip bzip2 xz bash coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf - attr acl zlib pcre libunistring libidn2; + attr acl zlib pcre libunistring; ${localSystem.libc} = getLibc prevStage; + + # Hack: avoid libidn2.{bin,dev} referencing bootstrap tools. There's a logical cycle. + libidn2 = import ../../development/libraries/libidn2/no-bootstrap-reference.nix { + inherit lib; + inherit (prevStage) libidn2; + inherit (self) stdenv runCommandLocal patchelf libunistring; + }; + } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. inherit (prevStage) binutils binutils-unwrapped; |