-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pure Wayland Support Version of OpenJDK with Nvidia Jetson OpenJDK wi…
…th gsettings utility fix Signed-off-by: Emrah Billur <emrah.billur@unikie.com> Java build fix Signed-off-by: Emrah Billur <emrah.billur@unikie.com> Format fix Signed-off-by: Emrah Billur <emrah.billur@unikie.com> Lib wakeland cmake build Signed-off-by: Emrah Billur <emrah.billur@unikie.com>
- Loading branch information
1 parent
0658031
commit 9f3fc46
Showing
7 changed files
with
247 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ | |
imports = [ | ||
./debug-tools.nix | ||
./usb-serial.nix | ||
./java.nix | ||
./nix.nix | ||
./ssh.nix | ||
]; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors | ||
# SPDX-License-Identifier: Apache-2.0 | ||
{ | ||
config, | ||
lib, | ||
pkgs, | ||
... | ||
}: let | ||
cfg = config.ghaf.development.java; | ||
in | ||
with lib; { | ||
options.ghaf.development.java = { | ||
enable = mkEnableOption "Java Support"; | ||
}; | ||
|
||
config = mkIf cfg.enable { | ||
programs.java = { | ||
enable = true; | ||
package = pkgs.jdk20; | ||
}; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
diff --git a/src/java.desktop/unix/native/libawt_wlawt/WLToolkit.c b/src/java.desktop/unix/native/libawt_wlawt/WLToolkit.c | ||
index 2f46d1354c5..d912f524942 100644 | ||
--- a/src/java.desktop/unix/native/libawt_wlawt/WLToolkit.c | ||
+++ b/src/java.desktop/unix/native/libawt_wlawt/WLToolkit.c | ||
@@ -794,28 +794,29 @@ initCursors() { | ||
int theme_size = 0; | ||
char buffer[256]; | ||
|
||
- char *size_str = getenv("XCURSOR_SIZE"); | ||
- if (!size_str) | ||
- size_str = readDesktopProperty("cursor-size", buffer, sizeof(buffer)); | ||
- if (size_str) | ||
- theme_size = atoi(size_str); | ||
- if (theme_size <= 0) | ||
+ // char *size_str = getenv("XCURSOR_SIZE"); | ||
+ // if (!size_str) | ||
+ // size_str = readDesktopProperty("cursor-size", buffer, sizeof(buffer)); | ||
+ // if (size_str) | ||
+ // theme_size = atoi(size_str); | ||
+ // if (theme_size <= 0) | ||
theme_size = 24; | ||
|
||
- theme_name = getenv("XCURSOR_THEME"); | ||
- if (!theme_name) { | ||
- theme_name = readDesktopProperty("cursor-theme", buffer, sizeof(buffer)); | ||
- if (theme_name) { | ||
- // drop surrounding quotes and trailing line break | ||
- int len = strlen(theme_name); | ||
- if (len > 2) { | ||
- theme_name[len - 2] = 0; | ||
- theme_name++; | ||
- } else { | ||
- theme_name = NULL; | ||
- } | ||
- } | ||
- } | ||
+ // theme_name = getenv("XCURSOR_THEME"); | ||
+ // if (!theme_name) { | ||
+ // theme_name = readDesktopProperty("cursor-theme", buffer, sizeof(buffer)); | ||
+ // if (theme_name) { | ||
+ // // drop surrounding quotes and trailing line break | ||
+ // int len = strlen(theme_name); | ||
+ // if (len > 2) { | ||
+ // theme_name[len - 2] = 0; | ||
+ // theme_name++; | ||
+ // } else { | ||
+ // theme_name = NULL; | ||
+ // } | ||
+ // } | ||
+ // } | ||
+ theme_name="YARU"; | ||
|
||
wl_cursor_theme = wl_cursor_theme_load(theme_name, theme_size, wl_shm); | ||
if (!wl_cursor_theme) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors | ||
# SPDX-License-Identifier: Apache-2.0 | ||
# { | ||
# final, | ||
# prev, | ||
# }: | ||
# # OpenJDK Pure Wayland version | ||
# prev.jdk21.overrideAttrs (_prevAttrs: { | ||
# src = final.pkgs.fetchFromGitHub { | ||
# owner = "openjdk"; | ||
# repo = "wakefield"; | ||
# rev = "pure_wl_toolkit_21"; | ||
# sha256 = "sha256-xmAqj0BLUhLl51AtWshJ8actpk35Gog4PnYqRCa/4RM="; | ||
# }; | ||
# #imports = [../../../packages/libwakefield]; | ||
# #buildInputs = [ libwakefield]; | ||
# #patches = [./GTK_fix.patch]; | ||
# # To fix the direct call for gsettings bug. But there is still problem since there is no GTK schemas installed | ||
# #postConfigure = '' | ||
# # substituteInPlace src/java.desktop/unix/native/libawt_wlawt/WLToolkit.c --replace 'gsettings' '${prev.glib}/bin/gsettings' | ||
# # ''; | ||
# }) | ||
{ | ||
final, | ||
prev, | ||
}: | ||
# OpenJDK Pure Wayland version | ||
prev.jdk20.overrideAttrs (_prevAttrs: { | ||
src = final.pkgs.fetchFromGitHub { | ||
owner = "openjdk"; | ||
repo = "wakefield"; | ||
rev = "pure_wl_toolkit"; | ||
hash = "sha256-TNaRRFqdVevD6tVIz2tBRmKuyNeRc+DXonnKG9adlto="; | ||
}; | ||
imports = [../../../packages/libwakefield]; | ||
libwakefield = final.callPackage ../../../packages/libwakefield {}; | ||
#buildInputs = [libwakefield]; | ||
#patches = [./GTK_fix.patch]; | ||
|
||
#hardeningDisable = [ "all" ]; | ||
#hardeningDisable = _prevAttrs.hardeningDisable or ["all"]; | ||
#NIX_CFLAGS_COMPILE = ( _prevAttrs.NIX_CFLAGS_COMPILE or [ "-g" "-O0" "-Wall" "-" ] ); | ||
|
||
#To fix the direct call for gsettings bug. But there is still problem since there is no GTK schemas installed | ||
postConfigure = '' | ||
substituteInPlace make/common/JavaCompilation.gmk --replace "-Werror" "" | ||
substituteInPlace make/Hsdis.gmk --replace "-Werror" "" | ||
substituteInPlace make/langtools/build.properties --replace "-Werror" "" | ||
#substituteInPlace make/autoconf/flags-cflags.m4 --replace "-Werror" "-Wnoerror" | ||
#substituteInPlace src/java.base/share/man/java.1 --replace "-Werror" "" | ||
#substituteInPlace src/java.base/share/native/libjli/args.c --replace "-Werror" "" | ||
#substituteInPlace src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java --replace "-Werror" "" | ||
#substituteInPlace src/jdk.javadoc/share/man/javadoc.1 --replace "-Werror" "" | ||
''; | ||
|
||
installPhase = | ||
'' | ||
pwd; | ||
echo "The build directory is: " . "and the contents are:" ; | ||
ls -l | ||
ls -la build | ||
echo "The out directory is: " $out "and the contents are:"; | ||
ls -l | ||
'' | ||
+ _prevAttrs.installPhase; | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors | ||
# SPDX-License-Identifier: Apache-2.0 | ||
{ | ||
fetchFromGitHub, | ||
lib, | ||
cmake, | ||
pkg-config, | ||
stdenv, | ||
gcc, | ||
pixman, | ||
weston, | ||
wayland, | ||
wayland-scanner, | ||
libxkbcommon | ||
}: | ||
let major-version-weston = "libweston-"+builtins.elemAt(builtins.splitVersion (weston.version)) 0; | ||
in stdenv.mkDerivation { | ||
name = "libwakefield"; | ||
|
||
depsBuildBuild = [cmake weston pixman wayland-scanner]; | ||
|
||
src = "${fetchFromGitHub { | ||
owner = "openjdk"; | ||
repo = "wakefield"; | ||
rev = "pure_wl_toolkit_21"; | ||
sha256 = "sha256-xmAqj0BLUhLl51AtWshJ8actpk35Gog4PnYqRCa/4RM="; | ||
}}/src/java.desktop/share/native/libwakefield"; | ||
|
||
nativeBuildInputs = [ | ||
cmake | ||
gcc | ||
pkg-config | ||
weston | ||
pixman | ||
]; | ||
|
||
buildInputs = [ | ||
wayland | ||
weston | ||
pixman | ||
libxkbcommon | ||
]; | ||
|
||
#cmakeFlags = lib.optionals (!stdenv.hostPlatform.isStatic) [ | ||
# "-DBUILD_SHARED_LIBS=ON" | ||
#]; | ||
|
||
|
||
configurePhase = '' | ||
substituteInPlace ./CMakeLists.txt --replace "libweston-9" "${major-version-weston}" | ||
substituteInPlace ./CMakeLists.txt --replace "pixman.h | ||
/usr/include /usr/local/include" "pixman.h | ||
${pixman.outPath}/include" | ||
# substituteInPlace ./CMakeLists.txt --replace "message(FATAL_ERROR \"pixman.h not found\") | ||
#endif ()" "set(PIXMAN_INCLUDES=${pixman.outPath}/include) | ||
#endif () | ||
#set(PIXMAN_INCLUDES=${pixman.outPath}/include)" | ||
echo "-------------------------CMakeList----------------------------------------------------" | ||
cat ./CMakeLists.txt | ||
echo "--------------------------------------------------------------------------------------" | ||
#find / -name pixman.h | ||
#find /nix/store -name pixman | ||
#find /usr/include -name pixman | ||
#find /include -name pixman | ||
mkdir build && cd build | ||
cmake ../ | ||
substituteInPlace CMakeFiles/wakefield.dir/flags.make --replace "-I/build/libwakefield/build" "-I${pixman.outPath}/include -I/build/libwakefield/build" | ||
echo "--------------------------Pixman Version-----------------------------------------------" | ||
echo "${pixman.version}" | ||
echo "--------------------------MakeFile----------------------------------------------------" | ||
cat Makefile | ||
echo "--------------------------------------------------------------------------------------" | ||
echo "--------------------------flags.make----------------------------------------------------" | ||
cat CMakeFiles/wakefield.dir/flags.make | ||
echo "--------------------------------------------------------------------------------------" | ||
''; | ||
|
||
buildPhase = '' | ||
make | ||
''; | ||
|
||
installPhase = '' | ||
#make install | ||
''; | ||
|
||
CFLAGS = ["-O3" "-funroll-loops"]; | ||
CXXFLAGS = ["-O3"]; | ||
|
||
outputs = ["bin" "dev" "out"]; | ||
|
||
meta = with lib; { | ||
description = "libwakefield"; | ||
platforms = [ | ||
"aarch64-linux" | ||
"x86_64-linux" | ||
]; | ||
}; | ||
} |