summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorRok Garbas <rok@garbas.si>2016-07-27 19:01:11 +0200
committerGitHub <noreply@github.com>2016-07-27 19:01:11 +0200
commitcd1dadf860836a1594f4bd5dd1ce5d86026e7d12 (patch)
treeef0b52e1855e0841d6f191e98a584af695ace171 /pkgs/development/libraries
parentf51169366b06f513fbb7657b979fa1cc62cd2ed7 (diff)
parent6d998e638660718ad82fadb8e6b7b6cf1d9563f3 (diff)
downloadnixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar
nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar.gz
nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar.bz2
nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar.lz
nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar.xz
nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar.zst
nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.zip
Merge pull request #17242 from rasendubi/mips-linux
Fixes for mips-linux
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/libiconv/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 9b62436ae080..5f1f6afcec12 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch =
-    lib.optionalString (stdenv.cross.libc or null == "msvcrt")
+    lib.optionalString ((stdenv ? cross && stdenv.cross.libc == "msvcrt") || stdenv.cc.nativeLibc)
       ''
         sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
       '';