summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-04-25 08:08:47 -0500
committerWill Dietz <w@wdtz.org>2018-04-25 08:08:47 -0500
commit97698b0d6d644cc6d59495e339f6fbf44ff8ac64 (patch)
tree0909cd267cb271db6deb59e1b2f4ba582e7bec9b
parent791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9 (diff)
downloadnixpkgs-97698b0d6d644cc6d59495e339f6fbf44ff8ac64.tar
nixpkgs-97698b0d6d644cc6d59495e339f6fbf44ff8ac64.tar.gz
nixpkgs-97698b0d6d644cc6d59495e339f6fbf44ff8ac64.tar.bz2
nixpkgs-97698b0d6d644cc6d59495e339f6fbf44ff8ac64.tar.lz
nixpkgs-97698b0d6d644cc6d59495e339f6fbf44ff8ac64.tar.xz
nixpkgs-97698b0d6d644cc6d59495e339f6fbf44ff8ac64.tar.zst
nixpkgs-97698b0d6d644cc6d59495e339f6fbf44ff8ac64.zip
musl-stdenv: don't add special allowance for libiconv
-rw-r--r--pkgs/stdenv/linux/default.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 2eb55ae439b..92da0d7873d 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -362,7 +362,6 @@ in
         ++  [ /*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 ];