Skip to content

Commit 37b2ed2

Browse files
committed
[DDW-1083] Remove theSDK from any-darwin.nix
1 parent 39373e1 commit 37b2ed2

File tree

1 file changed

+6
-22
lines changed

1 file changed

+6
-22
lines changed

nix/any-darwin.nix

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ let
1919
packageVersion = originalPackageJson.version;
2020
installerName = "daedalus-${packageVersion}.${toString sourceLib.buildRevCount}-${cluster}-${sourceLib.buildRevShort}-${pkgs.system}";
2121

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-
3522
in rec {
3623

3724
inherit newCommon oldCode;
@@ -73,12 +60,10 @@ in rec {
7360
name = "daedalus-node_modules";
7461
src = srcLockfiles;
7562
nativeBuildInputs = [ yarn nodejs ]
76-
++ (with pkgs; [ python3 pkgconfig jq darwin.cctools /*theSDK.*/xcbuild ]);
63+
++ (with pkgs; [ python3 pkgconfig jq darwin.cctools xcbuild ]);
7764
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
8267
]);
8368
configurePhase = newCommon.setupCacheAndGypDirs + darwinSpecificCaches;
8469
buildPhase = ''
@@ -126,12 +111,11 @@ in rec {
126111
name = pname;
127112
src = srcWithoutNix;
128113
nativeBuildInputs = [ yarn nodejs daedalus-installer ]
129-
++ (with pkgs; [ python3 pkgconfig darwin.cctools /*theSDK.*/xcbuild ]);
114+
++ (with pkgs; [ python3 pkgconfig darwin.cctools xcbuild ]);
130115
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
133118
libobjc
134-
#(theSDK.apple_sdk.sdk or theSDK.apple_sdk.MacOSX-SDK)
135119
]) ++ [
136120
daedalus-bridge
137121
darwin-launcher

0 commit comments

Comments
 (0)