Skip to content

Commit ed42119

Browse files
committed
Update rcodesign for recent MacOS
1 parent e2b53b3 commit ed42119

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

overlays/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ let
9393
cacheCompilerDeps = import ./cache-compiler-deps.nix;
9494
fetch-source = import ./fetch-source.nix;
9595
lazy-inputs = import ../lazy-inputs;
96+
rcodesign = import ./rcodesign.nix;
9697
};
9798

9899
composeExtensions = f: g: final: prev:
@@ -133,6 +134,7 @@ let
133134
cacheCompilerDeps
134135
fetch-source
135136
lazy-inputs
137+
rcodesign
136138
];
137139
combined = builtins.foldl' composeExtensions (_: _: { }) ordered;
138140
in overlays // { inherit combined; }

overlays/rcodesign.nix

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# nixpkgs is using `rcodesign` 0.22 and it fails to build on recent
2+
# versions of macOS (one of the tests fails validating signatures
3+
# in `/usr/bin`).
4+
final: prev: {
5+
rcodesign = prev.rcodesign.override (old: {
6+
rustPlatform = old.rustPlatform // {
7+
buildRustPackage = args: old.rustPlatform.buildRustPackage (args // {
8+
version = "0.27.0";
9+
10+
src = final.fetchFromGitHub {
11+
owner = "hamishmack";
12+
repo = "apple-platform-rs";
13+
rev = "hkm/cargo-update";
14+
hash = "sha256-gma2e73m2MDC8BAcIuclG/RPLhAHRLkehCa56f5835g=";
15+
};
16+
17+
cargoHash = "sha256-4ra1oBQK/kXZTKvvq17kX2+49iKyXXT484Z6ON4bFbU=";
18+
19+
buildInputs = final.lib.optionals final.stdenv.hostPlatform.isDarwin [
20+
final.darwin.apple_sdk_11_0.frameworks.Security
21+
final.darwin.apple_sdk_11_0.frameworks.SystemConfiguration
22+
];
23+
24+
checkFlags = [
25+
# Does network IO
26+
"--skip=ticket_lookup::test::lookup_ticket"
27+
"--skip=cli_tests"
28+
];
29+
});
30+
};
31+
});
32+
}

0 commit comments

Comments
 (0)