From fad703cb4a3dc5d21f79f1dfa632411daa705608 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 16 Apr 2023 04:06:17 +0300 Subject: [PATCH 1/2] ladybird: fix runtime error on darwin --- pkgs/applications/networking/browsers/ladybird/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index c4e16d432692..bfddd6aecc3a 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -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 = [ From 855d27a28b4da3b03b7570b38d4e012618f71325 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 16 Apr 2023 04:11:02 +0300 Subject: [PATCH 2/2] ladybird: fix build on x86_64-darwin --- .../applications/networking/browsers/ladybird/default.nix | 8 +------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index bfddd6aecc3a..1af17ad7aaaa 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -52,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 '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 261872100c73..11f08f970ffd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31590,7 +31590,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 { };