Skip to content

Commit a5d17e2

Browse files
authored
Merge pull request #147 from cachix/remove-macos-intel
Remove macOS Intel support
2 parents ead5c8e + 0e5f176 commit a5d17e2

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
matrix:
1919
os:
2020
- [self-hosted, linux, X64]
21-
- [macos-15-intel]
2221
- [self-hosted, macOS, ARM64]
2322
- [self-hosted, linux, ARM64]
2423
runs-on: ${{ matrix.os }}

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ To push your own builds to the cache (useful in CI or team setups), [create a Ca
4848

4949
Supported platforms:
5050

51-
- x86_64-darwin
5251
- x86_64-linux
5352
- aarch64-linux
5453
- aarch64-darwin

‎flake.nix‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
systems = [
1919
"x86_64-linux"
2020
"i686-linux"
21-
"x86_64-darwin"
2221
"aarch64-linux"
2322
"aarch64-darwin"
2423
];
@@ -269,10 +268,11 @@
269268
override =
270269
pkg:
271270
pkg.overrideAttrs (old: {
272-
prePatch = ''
273-
substituteInPlace Lib/subprocess.py --replace-fail '"/bin/sh"' "'/bin/sh'"
274-
''
275-
+ old.prePatch;
271+
prePatch =
272+
''
273+
substituteInPlace Lib/subprocess.py --replace-fail '"/bin/sh"' "'/bin/sh'"
274+
''
275+
+ old.prePatch;
276276
});
277277
}
278278
# fill in the missing pc file
@@ -281,10 +281,11 @@
281281
override =
282282
pkg:
283283
pkg.overrideAttrs (old: {
284-
postInstall = ''
285-
ln -s "$out/lib/pkgconfig/python-${pkg.passthru.sourceVersion.major}.${pkg.passthru.sourceVersion.minor}.pc" "$out/lib/pkgconfig/python3.pc"
286-
''
287-
+ old.postInstall;
284+
postInstall =
285+
''
286+
ln -s "$out/lib/pkgconfig/python-${pkg.passthru.sourceVersion.major}.${pkg.passthru.sourceVersion.minor}.pc" "$out/lib/pkgconfig/python3.pc"
287+
''
288+
+ old.postInstall;
288289
});
289290
}
290291
{

0 commit comments

Comments
 (0)