diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-05-16 15:04:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 15:04:13 -0400 |
| commit | f3fcf1b0a9b0398620b5fa9b40268ef651aa373e (patch) | |
| tree | 4ae8241b291639b92d8dc1b9ab206a91cdd67fc6 /pkgs | |
| parent | 136f1c470665a9328bb4120f3a4d9af774dadb2d (diff) | |
| parent | 4f25cf5124d90fbf5aafb168b124104eda5068f3 (diff) | |
| download | nixpkgs-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')
| -rw-r--r-- | pkgs/development/node-packages/default-v6.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/node-packages/default-v8.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 2be09eb1632..97f759ef0cb 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -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" diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index ed0477a639a..701648da228 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -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" 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76203b76027..9e6c6a52633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10811,7 +10811,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 { }; |