Skip to content

Fix some GHC dependencies on iOS #40393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 3 commits into from
May 16, 2018
Merged

Fix some GHC dependencies on iOS #40393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4956767
Make libiconv build for iOS with prefixed tools
Ericson2314 Sep 21, 2017
ceb8f6e
ios-rebuild: Unbreak build
Ericson2314 Sep 25, 2017
4f25cf5
ncurses: when cross-compiling for iOS, use built-in ncurses
May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkgs/development/node-packages/default-v6.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ nodePackages // {

ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
preRebuild = ''
LD=$CC
Copy link
Member

@Ericson2314 Ericson2314 May 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is another default-v*.nix that probably needs this too.

Copy link
Contributor Author

@ElvishJerricco ElvishJerricco May 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/node-packages/default-v8.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ nodePackages // {

ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
preRebuild = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
Expand Down
10 changes: 7 additions & 3 deletions pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10790,7 +10790,7 @@ with pkgs;
ncurses6 = callPackage ../development/libraries/ncurses {
abiVersion = "6";
};
ncurses = ncurses6;
ncurses = if hostPlatform.useiOSPrebuilt then null else ncurses6;

neardal = callPackage ../development/libraries/neardal { };

Expand Down