public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40393 from ElvishJerricco/ios-prebuilt-dependency-fixes 

Fix some GHC dependencies on iOS
This commit is contained in:
John Ericson 2018-05-16 15:04:13 -04:00 committed by GitHub
parent 136f1c4706 4f25cf5124
commit f3fcf1b0a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/node-packages/default-v6.nix
View File

@ -59,6 +59,7 @@ nodePackages // {
ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
preRebuild = '' preRebuild = ''
LD=$CC
tmp=$(mktemp -d) tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp" export PATH="$PATH:$tmp"

1
pkgs/development/node-packages/default-v8.nix
View File

@ -59,6 +59,7 @@ nodePackages // {
ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
preRebuild = '' preRebuild = ''
LD=$CC
tmp=$(mktemp -d) tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp" export PATH="$PATH:$tmp"

10
pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
View File

@ -1,14 +1,18 @@
{ stdenv, appleDerivation }: { stdenv, appleDerivation }:
appleDerivation { appleDerivation {
preConfigure = "cd libiconv"; preConfigure = "cd libiconv"
+ stdenv.lib.optionalString stdenv.hostPlatform.isiOS ''
sed -i 's/darwin\*/ios\*/g' configure libcharset/configure
'';
postInstall = '' postInstall = ''
mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib 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 # 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 \ -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/libiconv-nocharset.dylib \
-Wl,-reexport_library -Wl,$out/lib/libcharset.dylib -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib

2
pkgs/top-level/all-packages.nix
View File

@ -10811,7 +10811,7 @@ with pkgs;
ncurses6 = callPackage ../development/libraries/ncurses { ncurses6 = callPackage ../development/libraries/ncurses {
abiVersion = "6"; abiVersion = "6";
}; };
ncurses = ncurses6; ncurses = if hostPlatform.useiOSPrebuilt then null else ncurses6;
neardal = callPackage ../development/libraries/neardal { }; neardal = callPackage ../development/libraries/neardal { };