|
19 | 19 | packageVersion = originalPackageJson.version; |
20 | 20 | installerName = "daedalus-${packageVersion}.${toString sourceLib.buildRevCount}-${cluster}-${sourceLib.buildRevShort}-${pkgs.system}"; |
21 | 21 |
|
22 | | - # # On Catalina (x86), we can’t detect Ledger devices, unless: |
23 | | - # theSDK = if targetSystem == "aarch64-darwin" then { |
24 | | - # apple_sdk = pkgs.darwin.apple_sdk; |
25 | | - # xcbuild = pkgs.xcbuild; |
26 | | - # } else rec { |
27 | | - # apple_sdk = pkgs.darwin.apple_sdk_11_0; |
28 | | - # xcbuild = pkgs.xcbuild.override { |
29 | | - # inherit (apple_sdk) stdenv; |
30 | | - # inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; |
31 | | - # #sdkVer = "11.0"; |
32 | | - # }; |
33 | | - # }; |
34 | | - |
35 | 22 | in rec { |
36 | 23 |
|
37 | 24 | inherit newCommon oldCode; |
@@ -73,12 +60,10 @@ in rec { |
73 | 60 | name = "daedalus-node_modules"; |
74 | 61 | src = srcLockfiles; |
75 | 62 | nativeBuildInputs = [ yarn nodejs ] |
76 | | - ++ (with pkgs; [ python3 pkgconfig jq darwin.cctools /*theSDK.*/xcbuild ]); |
| 63 | + ++ (with pkgs; [ python3 pkgconfig jq darwin.cctools xcbuild ]); |
77 | 64 | buildInputs = (with pkgs.darwin; [ |
78 | | - #/*theSDK.*/apple_sdk.frameworks.IOKit |
79 | | - /*theSDK.*/apple_sdk.frameworks.CoreServices # old-shell.nix has this instead of IOKit, let’s try |
80 | | - /*theSDK.*/apple_sdk.frameworks.AppKit |
81 | | - #(theSDK.apple_sdk.sdk or theSDK.apple_sdk.MacOSX-SDK) |
| 65 | + apple_sdk.frameworks.CoreServices |
| 66 | + apple_sdk.frameworks.AppKit |
82 | 67 | ]); |
83 | 68 | configurePhase = newCommon.setupCacheAndGypDirs + darwinSpecificCaches; |
84 | 69 | buildPhase = '' |
@@ -126,12 +111,11 @@ in rec { |
126 | 111 | name = pname; |
127 | 112 | src = srcWithoutNix; |
128 | 113 | nativeBuildInputs = [ yarn nodejs daedalus-installer ] |
129 | | - ++ (with pkgs; [ python3 pkgconfig darwin.cctools /*theSDK.*/xcbuild ]); |
| 114 | + ++ (with pkgs; [ python3 pkgconfig darwin.cctools xcbuild ]); |
130 | 115 | buildInputs = (with pkgs.darwin; [ |
131 | | - /*theSDK.*/apple_sdk.frameworks.CoreServices |
132 | | - /*theSDK.*/apple_sdk.frameworks.AppKit |
| 116 | + apple_sdk.frameworks.CoreServices |
| 117 | + apple_sdk.frameworks.AppKit |
133 | 118 | libobjc |
134 | | - #(theSDK.apple_sdk.sdk or theSDK.apple_sdk.MacOSX-SDK) |
135 | 119 | ]) ++ [ |
136 | 120 | daedalus-bridge |
137 | 121 | darwin-launcher |
|
0 commit comments