ride: use apple-sdk_11
This commit is contained in:
parent
2296b47832
commit
c7af6b765b
@ -12,7 +12,7 @@
|
|||||||
copyDesktopItems,
|
copyDesktopItems,
|
||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
electron,
|
electron,
|
||||||
cctools,
|
apple-sdk_11,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
@ -65,21 +65,15 @@ buildNpmPackage rec {
|
|||||||
popd
|
popd
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs = [
|
||||||
[
|
zip
|
||||||
zip
|
makeWrapper
|
||||||
makeWrapper
|
] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
|
||||||
]
|
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]
|
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
|
|
||||||
|
|
||||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||||
|
|
||||||
# Fix error: no member named 'aligned_alloc' in the global namespace
|
|
||||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (
|
|
||||||
stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0"
|
|
||||||
) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1";
|
|
||||||
|
|
||||||
# our patch adds the platform detecting build option
|
# our patch adds the platform detecting build option
|
||||||
npmBuildFlags = "self";
|
npmBuildFlags = "self";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user