mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 04:50:21 +00:00
Fix for jcef 241
This commit is contained in:
@@ -100,7 +100,7 @@ let
|
||||
sourceRoot = "source/native/fsNotifier/linux";
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cc -O2 -Wall -Wextra -Wpedantic -D "VERSION=\"${buildVer}\"" -std=c11 main.c inotify.c util.c -o fsnotifier
|
||||
$CC -O2 -Wall -Wextra -Wpedantic -D "VERSION=\"${buildVer}\"" -std=c11 main.c inotify.c util.c -o fsnotifier
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
, atk
|
||||
, at-spi2-atk
|
||||
, libdrm
|
||||
, libGL
|
||||
, expat
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
@@ -41,6 +42,8 @@
|
||||
, cups
|
||||
, libxshmfence
|
||||
, udev
|
||||
, boost
|
||||
, thrift
|
||||
}:
|
||||
|
||||
assert !stdenv.isDarwin;
|
||||
@@ -54,6 +57,7 @@ let
|
||||
atk
|
||||
at-spi2-atk
|
||||
libdrm
|
||||
libGL
|
||||
expat
|
||||
libxcb
|
||||
libxkbcommon
|
||||
@@ -97,28 +101,28 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jcef-jetbrains";
|
||||
rev = "9f8d4fb20b4658db6b2b6bc08e5dd0d8c7340290";
|
||||
rev = "5e368cf6456d6319967e466e96ad5fa99f412c85";
|
||||
# This is the commit number
|
||||
# Currently from the branch: https://github.com/JetBrains/jcef/tree/232
|
||||
# Run `git rev-list --count HEAD`
|
||||
version = "675";
|
||||
version = "767";
|
||||
|
||||
nativeBuildInputs = [ cmake python3 jdk17 git rsync ant ninja strip-nondeterminism stripJavaArchivesHook ];
|
||||
buildInputs = [ libX11 libXdamage nss nspr ];
|
||||
buildInputs = [ boost libX11 libXdamage nss nspr thrift ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetbrains";
|
||||
repo = "jcef";
|
||||
inherit rev;
|
||||
hash = "sha256-8zsgcWl0lZtC1oud5IlkUdeXxJUlHoRfw8t0FrZUQec=";
|
||||
hash = "sha256-n+zwxHkyjkjaFhnYWcDNfsqRZIXzZplZiyeHNExfxKU=";
|
||||
};
|
||||
cef-bin =
|
||||
let
|
||||
# `cef_binary_${CEF_VERSION}_linux64_minimal`, where CEF_VERSION is from $src/CMakeLists.txt
|
||||
name = "cef_binary_111.2.1+g870da30+chromium-111.0.5563.64_${platform}_minimal";
|
||||
name = "cef_binary_122.1.9+gd14e051+chromium-122.0.6261.94_${platform}_minimal";
|
||||
hash = {
|
||||
"linuxarm64" = "sha256-gCDIfWsysXE8lHn7H+YM3Jag+mdbWwTQpJf0GKdXEVs=";
|
||||
"linux64" = "sha256-r+zXTmDN5s/bYLvbCnHufYdXIqQmCDlbWgs5pdOpLTw=";
|
||||
"linuxarm64" = "sha256-wABtvz0JHitlkkB748I7yr02Oxs5lXvqDfrBAQiKWHU=";
|
||||
"linux64" = "sha256-qlutM0IsE1emcMe/3p7kwMIK7ou1rZGvpUkrSMVPnCc=";
|
||||
}.${platform};
|
||||
urlName = builtins.replaceStrings [ "+" ] [ "%2B" ] name;
|
||||
in
|
||||
@@ -139,6 +143,7 @@ stdenv.mkDerivation rec {
|
||||
cp -r ${cef-bin} third_party/cef/${cef-bin.name}
|
||||
chmod +w -R third_party/cef/${cef-bin.name}
|
||||
patchelf third_party/cef/${cef-bin.name}/${buildType}/libcef.so --set-rpath "${rpath}" --add-needed libudev.so
|
||||
patchelf third_party/cef/${cef-bin.name}/${buildType}/libGLESv2.so --set-rpath "${rpath}" --add-needed libGL.so.1
|
||||
patchelf third_party/cef/${cef-bin.name}/${buildType}/chrome-sandbox --set-interpreter $(cat $NIX_BINTOOLS/nix-support/dynamic-linker)
|
||||
sed 's/-O0/-O2/' -i third_party/cef/${cef-bin.name}/cmake/cef_variables.cmake
|
||||
|
||||
@@ -152,6 +157,14 @@ stdenv.mkDerivation rec {
|
||||
cp ${clang-fmt} tools/buildtools/linux64/clang-format
|
||||
chmod +w tools/buildtools/linux64/clang-format
|
||||
|
||||
sed \
|
||||
-e 's|include(cmake/vcpkg.cmake)||' \
|
||||
-e 's|bring_vcpkg()||' \
|
||||
-e 's|vcpkg_install_package(boost-filesystem boost-interprocess thrift)||' \
|
||||
-i CMakeLists.txt
|
||||
|
||||
sed -e 's|vcpkg_bring_host_thrift()|set(THRIFT_COMPILER_HOST ${thrift}/bin/thrift)|' -i remote/CMakeLists.txt
|
||||
|
||||
mkdir jcef_build
|
||||
cd jcef_build
|
||||
|
||||
|
||||
Reference in New Issue
Block a user