diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-02-09 16:08:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-09 16:08:45 +0100 |
| commit | 02e2ee0374c62ec0c28c8ab095077eed0cba6ac3 (patch) | |
| tree | 6733832c082563ddaa8720501e0f255a80d6e9f5 | |
| parent | 32f4189721c6821d273fafaafbaaf5f0eac2f1f4 (diff) | |
| parent | d7e31cc214af05d4859987c73866f5ec0ed221f6 (diff) | |
Merge pull request #211266 from fgaz/ladybird/2023-01-17
ladybird: unstable-2022-09-29 -> unstable-2023-01-17
| -rw-r--r-- | pkgs/applications/networking/browsers/ladybird/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 15 insertions, 17 deletions
diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 1bba399997f46..0683b5210cbc8 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,28 +10,25 @@ , nixosTests }: -let serenity = fetchFromGitHub { - owner = "SerenityOS"; - repo = "serenity"; - rev = "a0f3e2c9a2b82117aa7c1a3444ad0d31baa070d5"; - hash = "sha256-8Xde59ZfdkTD39mYSv0lfFjBHFDWTUwfozE+Q9Yq6C8="; -}; -in stdenv.mkDerivation { pname = "ladybird"; - version = "unstable-2022-09-29"; + version = "unstable-2023-01-17"; - # Remember to update `serenity` too! src = fetchFromGitHub { owner = "SerenityOS"; - repo = "ladybird"; - rev = "d69ad7332477de33bfd1963026e057d55c6f222d"; - hash = "sha256-XQj2Bohk8F6dGCAManOmmDP5b/SqEeZXZbLDYPfvi2E="; + repo = "serenity"; + rev = "45e85d20b64862df119f643f24e2d500c76c58f3"; + hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY="; }; + sourceRoot = "source/Ladybird"; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace "MACOSX_BUNDLE TRUE" "MACOSX_BUNDLE FALSE" + # https://github.com/SerenityOS/serenity/issues/17062 + substituteInPlace main.cpp \ + --replace "./SQLServer/SQLServer" "$out/bin/SQLServer" ''; nativeBuildInputs = [ @@ -47,17 +44,18 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DSERENITY_SOURCE_DIR=${serenity}" # Disable network operations "-DENABLE_TIME_ZONE_DATABASE_DOWNLOAD=false" "-DENABLE_UNICODE_DATABASE_DOWNLOAD=false" ]; - # error: use of undeclared identifier 'aligned_alloc' - NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") [ + NIX_CFLAGS_COMPILE = [ + "-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" - ]); + ]; # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e47674107bbd0..2f066941e99cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30871,7 +30871,7 @@ with pkgs; ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; + stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc12Stdenv; }; lazpaint = callPackage ../applications/graphics/lazpaint { }; |