summary refs log tree commit diff
path: root/pkgs/development
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/development
parent136f1c470665a9328bb4120f3a4d9af774dadb2d (diff)
parent4f25cf5124d90fbf5aafb168b124104eda5068f3 (diff)
downloadnixlib-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar
nixlib-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar.gz
nixlib-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar.bz2
nixlib-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar.lz
nixlib-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar.xz
nixlib-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.tar.zst
nixlib-f3fcf1b0a9b0398620b5fa9b40268ef651aa373e.zip
Merge pull request #40393 from ElvishJerricco/ios-prebuilt-dependency-fixes
Fix some GHC dependencies on iOS
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/node-packages/default-v6.nix1
-rw-r--r--pkgs/development/node-packages/default-v8.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
index 2be09eb16324..97f759ef0cbe 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 ed0477a639a7..701648da2280 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"