diff --git a/default.nix b/default.nix index 85b1df05..fceb10a4 100644 --- a/default.nix +++ b/default.nix @@ -55,16 +55,14 @@ let }; } .${platform}; + cef_version = "135.0.20+ge7de5c3+chromium-135.0.7049.85"; inherit (arches) depsArch projectArch targetArch; in pkgs.stdenv.mkDerivation rec { pname = "jcef-ccbluex"; - rev = "06399a49d24f2c372668ccce26a15c533199ec9e"; - # This is the commit number - # Currently from the branch: https://github.com/JetBrains/jcef/tree/242 - # Run `git rev-list --count HEAD` - version = "867"; + rev = "eaeb3d4370aa3526ee237ad1981ad59af3de4dd1"; + version = "458"; nativeBuildInputs = with pkgs; [ cmake @@ -84,21 +82,14 @@ pkgs.stdenv.mkDerivation rec { thrift ]; - #src = fetchFromGitHub { - # owner = "CCBlueX"; - # repo = "java-cef"; - # inherit rev; - # hash = "sha256-V/RlPp6a8ouVbUWwyPPU2hcsUlUXhVicc2yaPyi3GO0="; - #}; - src = ./.; cef-bin = let # `cef_binary_${CEF_VERSION}_linux64_minimal`, where CEF_VERSION is from $src/CMakeLists.txt - name = "cef_binary_122.1.10+gc902316+chromium-122.0.6261.112_${platform}"; + name = "cef_binary_${cef_version}_${platform}"; hash = { - "linux64" = "sha256-4EGKJgfRon4vkbwq14V5gSlph0Z5sjVnrzWv9nlQ20Q="; + "linux64" = "sha256-hnndcV5UhCHa4VZOLajiPfejEXWrvCgxsFe2+a80t+Y="; } .${platform}; urlName = builtins.replaceStrings [ "+" ] [ "%2B" ] name; @@ -112,7 +103,7 @@ pkgs.stdenv.mkDerivation rec { url = "https://storage.googleapis.com/chromium-clang-format/dd736afb28430c9782750fc0fd5f0ed497399263"; hash = "sha256-4H6FVO9jdZtxH40CSfS+4VESAHgYgYxfCBFSMHdT0hE="; }; - releaseName = { + releaseName = { "linux64" = "linux_amd64"; }.${platform};