JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #211266 from fgaz/ladybird/2023-01-17

Browse Source 
ladybird: unstable-2022-09-29 -> unstable-2023-01-17
This commit is contained in:
Sandro 2023-02-09 16:08:45 +01:00 committed by GitHub
commit 02e2ee0374
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/networking/browsers/ladybird/default.nix
View File

@ -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";

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };