ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-07 14:00:59 +03:00
Code Issues Projects Releases Wiki Activity

ladybird: unstable-2022-08-14 -> unstable-2022-09-29

Browse Source
This commit is contained in:
Francesco Gazzetta 2022-09-30 09:50:43 +02:00
parent 2c81cda2f6
commit 75ae3f6d56
1 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,6 @@
, ninja
, unzip
, wrapQtAppsHook
, makeWrapper
, qtbase
, qttools
, nixosTests
@ -14,20 +13,20 @@
let serenity = fetchFromGitHub {
owner = "SerenityOS";
repo = "serenity";
rev = "ae8f1c7dc88e5bd79fb3e232e540ddc3dd2f1c11";
hash = "sha256-1OcSBwEs/SGocTlOoVEv+2bTg4kqtUT2TUBOWG7BqkE=";
rev = "a0f3e2c9a2b82117aa7c1a3444ad0d31baa070d5";
hash = "sha256-8Xde59ZfdkTD39mYSv0lfFjBHFDWTUwfozE+Q9Yq6C8=";
};
in gcc11Stdenv.mkDerivation {
pname = "ladybird";
version = "unstable-2022-08-14";
version = "unstable-2022-09-29";
# Remember to update `serenity` too!
src = fetchFromGitHub {
owner = "awesomekling";
owner = "SerenityOS";
repo = "ladybird";
rev = "35a6f69d65fcdb17fb9f84247fe8caf2b49f7c7d";
hash = "sha256-W46GXK2vxDgeUtCR3OwUs00WiAAu0aAERmtxrt2ICYI=";
rev = "d69ad7332477de33bfd1963026e057d55c6f222d";
hash = "sha256-XQj2Bohk8F6dGCAManOmmDP5b/SqEeZXZbLDYPfvi2E=";
};
nativeBuildInputs = [
@ -35,7 +34,6 @@ in gcc11Stdenv.mkDerivation {
ninja
unzip
wrapQtAppsHook
makeWrapper
];
buildInputs = [
@ -49,40 +47,6 @@ in gcc11Stdenv.mkDerivation {
"-DENABLE_UNICODE_DATABASE_DOWNLOAD=false"
];
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
# Upstream install rules are missing
# https://github.com/awesomekling/ladybird/issues/36
installPhase = ''
runHook preInstall
install -Dm755 ladybird $out/bin/ladybird
mkdir -p $out/lib/ladybird
cp -d _deps/lagom-build/*.so* $out/lib/ladybird/
runHook postInstall
'';
# Patch rpaths
# https://github.com/awesomekling/ladybird/issues/36
preFixup = ''
for f in $out/bin/ladybird $out/lib/ladybird/*.so; do
old_rpath=$(patchelf --print-rpath "$f")
# Remove reference to libraries from build directory
rpath_without_build=$(sed -e 's@[^:]*/_deps/lagom-build:@@g' <<< $old_rpath)
# Add directory where we install those libraries
new_rpath=$out/lib/ladybird:$rpath_without_build
patchelf --set-rpath "$new_rpath" "$f"
done
'';
# According to the readme, the program needs access to the serenity sources
# at runtime
postFixup = ''
wrapProgram $out/bin/ladybird --set SERENITY_SOURCE_DIR "${serenity}"
'';
# Stripping results in a symbol lookup error
dontStrip = true;
passthru.tests = {
nixosTest = nixosTests.ladybird;
};
@ -93,7 +57,6 @@ in gcc11Stdenv.mkDerivation {
license = licenses.bsd2;
maintainers = with maintainers; [ fgaz ];
# SerenityOS only works on x86, and can only be built on unix systems.
# We also use patchelf in preFixup, so we restrict that to linux only.
platforms = [ "x86_64-linux" "i686-linux" ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
};
}