From 74ad3dc74f05b450da2b015c65baadb49f2b48c8 Mon Sep 17 00:00:00 2001 From: yaraksan Date: Mon, 14 Jul 2025 21:25:34 +0200 Subject: [PATCH 1/4] Updated CEF version --- default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/default.nix b/default.nix index 85b1df05..f5ca214b 100644 --- a/default.nix +++ b/default.nix @@ -55,16 +55,12 @@ 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"; nativeBuildInputs = with pkgs; [ cmake @@ -84,18 +80,11 @@ 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="; @@ -112,7 +101,7 @@ pkgs.stdenv.mkDerivation rec { url = "https://storage.googleapis.com/chromium-clang-format/dd736afb28430c9782750fc0fd5f0ed497399263"; hash = "sha256-4H6FVO9jdZtxH40CSfS+4VESAHgYgYxfCBFSMHdT0hE="; }; - releaseName = { + releaseName = { "linux64" = "linux_amd64"; }.${platform}; From 4f8178bbb360344b509c36411f52b2669c77325a Mon Sep 17 00:00:00 2001 From: yaraksan Date: Mon, 14 Jul 2025 21:44:10 +0200 Subject: [PATCH 2/4] Fixed hash --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index f5ca214b..5ce695e0 100644 --- a/default.nix +++ b/default.nix @@ -87,7 +87,7 @@ pkgs.stdenv.mkDerivation rec { name = "cef_binary_${cef_version}_${platform}"; hash = { - "linux64" = "sha256-4EGKJgfRon4vkbwq14V5gSlph0Z5sjVnrzWv9nlQ20Q="; + "linux64" = "sha256-hnndcV5UhCHa4VZOLajiPfejEXWrvCgxsFe2+a80t+Y="; } .${platform}; urlName = builtins.replaceStrings [ "+" ] [ "%2B" ] name; From 9097da54d6fd398978d477a0afa63b6c8d0abaf7 Mon Sep 17 00:00:00 2001 From: yaraksan Date: Mon, 14 Jul 2025 21:53:39 +0200 Subject: [PATCH 3/4] Fixed build --- default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default.nix b/default.nix index 5ce695e0..c11fd67b 100644 --- a/default.nix +++ b/default.nix @@ -61,6 +61,8 @@ let in pkgs.stdenv.mkDerivation rec { pname = "jcef-ccbluex"; + rev = "eaeb3d4370aa3526ee237ad1981ad59af3de4dd1"; + version = "25.07.14"; nativeBuildInputs = with pkgs; [ cmake From 5a981fc6ae0e2390734e30146f57a7ba5ecb09de Mon Sep 17 00:00:00 2001 From: yaraksan Date: Mon, 14 Jul 2025 22:00:32 +0200 Subject: [PATCH 4/4] Fixed version... --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index c11fd67b..fceb10a4 100644 --- a/default.nix +++ b/default.nix @@ -62,7 +62,7 @@ in pkgs.stdenv.mkDerivation rec { pname = "jcef-ccbluex"; rev = "eaeb3d4370aa3526ee237ad1981ad59af3de4dd1"; - version = "25.07.14"; + version = "458"; nativeBuildInputs = with pkgs; [ cmake