From 721832f97ec96a4fd34549eada8c58314a457f9c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Apr 2019 00:24:37 -0400 Subject: [PATCH] libiconv: get just headers from wasilibc --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dae73418e20..fe39c4ec330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10311,7 +10311,7 @@ in else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else if name == "libSystem" then targetPackages.darwin.xcode else if name == "nblibc" then targetPackages.netbsdCross.libc - else if name == "wasilibc" then targetPackages.wasilibc + else if name == "wasilibc" then targetPackages.wasilibc or wasilibc else throw "Unknown libc ${name}"; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; @@ -11402,7 +11402,7 @@ in # We also provide `libiconvReal`, which will always be a standalone libiconv, # just in case you want it regardless of platform. libiconv = - if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") + if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"] then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc)