summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-01-12 02:07:02 -0600
committerWill Dietz <w@wdtz.org>2018-02-13 09:44:40 -0600
commit9dbbd75e547237407834d49a6d3a55fb03e79a57 (patch)
tree3b76e65102d405964e3389ff6e4c54811b7b5eec /pkgs/stdenv
parentfd00d37b4fa1d53f661062e219fcadace6dd962a (diff)
downloadnixlib-9dbbd75e547237407834d49a6d3a55fb03e79a57.tar
nixlib-9dbbd75e547237407834d49a6d3a55fb03e79a57.tar.gz
nixlib-9dbbd75e547237407834d49a6d3a55fb03e79a57.tar.bz2
nixlib-9dbbd75e547237407834d49a6d3a55fb03e79a57.tar.lz
nixlib-9dbbd75e547237407834d49a6d3a55fb03e79a57.tar.xz
nixlib-9dbbd75e547237407834d49a6d3a55fb03e79a57.tar.zst
nixlib-9dbbd75e547237407834d49a6d3a55fb03e79a57.zip
musl bootstrap: allow libiconv
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/linux/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 603b8aeea8b5..8522413ea034 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -340,6 +340,7 @@ in
             glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
             binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params
           ]
+          ++ lib.optional (localSystem.libc == "musl") libiconv
           ++ lib.optionals localSystem.isAarch64
             [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];