Merge pull request #226334 from wegank/ladybird-darwin
ladybird: fix runtime error on darwin
This commit is contained in:
commit
a59209ebd0
|
@ -29,6 +29,9 @@ stdenv.mkDerivation {
|
|||
# https://github.com/SerenityOS/serenity/issues/17062
|
||||
substituteInPlace main.cpp \
|
||||
--replace "./SQLServer/SQLServer" "$out/bin/SQLServer"
|
||||
# https://github.com/SerenityOS/serenity/issues/10055
|
||||
substituteInPlace ../Meta/Lagom/CMakeLists.txt \
|
||||
--replace "@rpath" "$out/lib"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -49,13 +52,7 @@ stdenv.mkDerivation {
|
|||
"-DENABLE_UNICODE_DATABASE_DOWNLOAD=false"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString ([
|
||||
"-Wno-error"
|
||||
] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") [
|
||||
# error: use of undeclared identifier 'aligned_alloc'
|
||||
"-include mm_malloc.h"
|
||||
"-Daligned_alloc=_mm_malloc"
|
||||
]);
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
# https://github.com/SerenityOS/serenity/issues/10055
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
@ -31603,7 +31603,7 @@ with pkgs;
|
|||
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
|
||||
|
||||
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
|
||||
stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv;
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv;
|
||||
};
|
||||
|
||||
lazpaint = callPackage ../applications/graphics/lazpaint { };
|
||||
|
|
Loading…
Reference in a new issue