summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@yahoo.com>2018-05-16 15:04:13 -0400
committerGitHub <noreply@github.com>2018-05-16 15:04:13 -0400
commitf3fcf1b0a9b0398620b5fa9b40268ef651aa373e (patch)
tree4ae8241b291639b92d8dc1b9ab206a91cdd67fc6 /pkgs/os-specific
parent136f1c470665a9328bb4120f3a4d9af774dadb2d (diff)
parent4f25cf5124d90fbf5aafb168b124104eda5068f3 (diff)
downloadnixpkgs-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar
nixpkgs-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar.gz
nixpkgs-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar.bz2
nixpkgs-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar.lz
nixpkgs-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar.xz
nixpkgs-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar.zst
nixpkgs-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.zip
Merge pull request #40393 from ElvishJerricco/ios-prebuilt-dependency-fixes
Fix some GHC dependencies on iOS
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index d9b3dfb7404..3cee697366b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -1,14 +1,18 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  preConfigure = "cd libiconv";
+  preConfigure = "cd libiconv"
+    + stdenv.lib.optionalString stdenv.hostPlatform.isiOS ''
+
+      sed -i 's/darwin\*/ios\*/g' configure libcharset/configure
+    '';
 
   postInstall = ''
     mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
-    install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
+    ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
 
     # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs
-    echo 'void dont_use_this(){}' | clang -dynamiclib -x c - -current_version 2.4.0 \
+    echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \
       -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \
       -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \
       -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib