jetbrains-jdk: add JCEF support
This commit is contained in:
GenericNerdyUsername
parent
95338455f7
commit
b1efcf7886
@ -127,9 +127,9 @@ let
|
||||
}).overrideAttrs (attrs: {
|
||||
postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux ''
|
||||
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
|
||||
patchelf --set-interpreter $interp $out/goland*/plugins/go-plugin/lib/dlv/linux/dlv
|
||||
patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv
|
||||
|
||||
chmod +x $out/goland*/plugins/go-plugin/lib/dlv/linux/dlv
|
||||
chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv
|
||||
|
||||
# fortify source breaks build since delve compiles with -O0
|
||||
wrapProgram $out/bin/goland \
|
||||
@ -287,12 +287,6 @@ let
|
||||
'';
|
||||
maintainers = with maintainers; [ abaldeau ];
|
||||
};
|
||||
}).overrideAttrs (attrs: {
|
||||
postPatch = (attrs.postPatch or "") + optionalString (stdenv.isLinux) ''
|
||||
# Webstorm tries to use bundled jre if available.
|
||||
# Lets prevent this for the moment
|
||||
rm -r jbr
|
||||
'';
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
@ -46,6 +46,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
|
||||
truncate --size=$size $fname
|
||||
}
|
||||
|
||||
rm -rf jbr
|
||||
|
||||
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
|
||||
if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then
|
||||
target_size=$(get_file_size bin/fsnotifier64)
|
||||
|
||||
@ -3,11 +3,41 @@
|
||||
, fetchFromGitHub
|
||||
, jetbrains
|
||||
, openjdk17
|
||||
, openjdk17-bootstrap
|
||||
, git
|
||||
, autoconf
|
||||
, unzip
|
||||
, rsync
|
||||
, debugBuild ? false
|
||||
|
||||
, libXdamage
|
||||
, libXxf86vm
|
||||
, libXrandr
|
||||
, libXi
|
||||
, libXcursor
|
||||
, libXrender
|
||||
, libX11
|
||||
, libXext
|
||||
, libxcb
|
||||
, nss
|
||||
, nspr
|
||||
, libdrm
|
||||
, mesa
|
||||
, wayland
|
||||
, udev
|
||||
}:
|
||||
|
||||
openjdk17.overrideAttrs (oldAttrs: rec {
|
||||
pname = "jetbrains-jdk";
|
||||
version = "17.0.5-b653.14";
|
||||
pname = "jetbrains-jdk-jcef";
|
||||
javaVersion = "17.0.5";
|
||||
build = "653.14";
|
||||
# To get the new tag:
|
||||
# git clone https://github.com/jetbrains/jetbrainsruntime
|
||||
# cd jetbrainsruntime
|
||||
# git reset --hard [revision]
|
||||
# git log --simplify-by-decoration --decorate=short --pretty=short | grep "jdk-" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1
|
||||
openjdkTag = "jdk-18+0";
|
||||
version = "${javaVersion}-b${build}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JetBrains";
|
||||
@ -16,6 +46,78 @@ openjdk17.overrideAttrs (oldAttrs: rec {
|
||||
hash = "sha256-7Nx7Y12oMfs4zeQMSfnUaDCW1xJYMEkcoTapSpmVCfU=";
|
||||
};
|
||||
|
||||
BOOT_JDK = openjdk17-bootstrap.home;
|
||||
SOURCE_DATE_EPOCH = 1666098567;
|
||||
|
||||
patches = [];
|
||||
|
||||
# Configure is done in build phase
|
||||
configurePhase = "true";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
mkdir -p jcef_linux_x64/jmods
|
||||
cp ${jetbrains.jcef}/* jcef_linux_x64/jmods
|
||||
|
||||
sed \
|
||||
-e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/" \
|
||||
-e "s/SOURCE_DATE_EPOCH=.*//" \
|
||||
-e "s/export SOURCE_DATE_EPOCH//" \
|
||||
-i jb/project/tools/common/scripts/common.sh
|
||||
sed -i "s/STATIC_CONF_ARGS/STATIC_CONF_ARGS \$configureFlags/" jb/project/tools/linux/scripts/mkimages_x64.sh
|
||||
sed \
|
||||
-e "s/create_image_bundle \"jb/#/" \
|
||||
-e "s/echo Creating /exit 0 #/" \
|
||||
-i jb/project/tools/linux/scripts/mkimages_x64.sh
|
||||
|
||||
patchShebangs .
|
||||
./jb/project/tools/linux/scripts/mkimages_x64.sh ${build} ${if debugBuild then "fd" else "jcef"}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = let
|
||||
buildType = if debugBuild then "fastdebug" else "release";
|
||||
debugSuffix = if debugBuild then "-fastdebug" else "";
|
||||
jcefSuffix = if debugBuild then "" else "_jcef";
|
||||
in ''
|
||||
runHook preInstall
|
||||
|
||||
rm -rf build/linux-x86_64-server-${buildType}/images/jdk
|
||||
mv build/linux-x86_64-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-x64${debugSuffix}-b${build} build/linux-x86_64-server-${buildType}/images/jdk
|
||||
'' + oldAttrs.installPhase + "runHook postInstall";
|
||||
|
||||
postInstall = ''
|
||||
chmod +x $out/lib/openjdk/lib/chrome-sandbox
|
||||
'';
|
||||
|
||||
dontStrip = debugBuild;
|
||||
|
||||
postFixup = ''
|
||||
# Build the set of output library directories to rpath against
|
||||
LIBDIRS="${lib.makeLibraryPath [
|
||||
libXdamage libXxf86vm libXrandr libXi libXcursor libXrender libX11 libXext libxcb
|
||||
nss nspr libdrm mesa wayland udev
|
||||
]}"
|
||||
for output in $outputs; do
|
||||
if [ "$output" = debug ]; then continue; fi
|
||||
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
|
||||
done
|
||||
# Add the local library paths to remove dependencies on the bootstrap
|
||||
for output in $outputs; do
|
||||
if [ "$output" = debug ]; then continue; fi
|
||||
OUTPUTDIR=$(eval echo \$$output)
|
||||
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
|
||||
echo "$BINLIBS" | while read i; do
|
||||
patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
|
||||
patchelf --shrink-rpath "$i" || true
|
||||
done
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ git autoconf unzip rsync ] ++ oldAttrs.nativeBuildInputs;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OpenJDK fork to better support Jetbrains's products.";
|
||||
longDescription = ''
|
||||
@ -25,7 +127,6 @@ openjdk17.overrideAttrs (oldAttrs: rec {
|
||||
include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI
|
||||
support, ligatures, some fixes for native crashes not presented in
|
||||
official build, and other small enhancements.
|
||||
|
||||
JetBrains Runtime is not a certified build of OpenJDK. Please, use at
|
||||
your own risk.
|
||||
'';
|
||||
|
||||
221
pkgs/development/compilers/jetbrains-jdk/jcef.nix
Normal file
221
pkgs/development/compilers/jetbrains-jdk/jcef.nix
Normal file
@ -0,0 +1,221 @@
|
||||
{ fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, stdenv
|
||||
, cmake
|
||||
, python3
|
||||
, jdk17
|
||||
, git
|
||||
, libcef
|
||||
, rsync
|
||||
, lib
|
||||
, ant
|
||||
, ninja
|
||||
|
||||
, debugBuild ? false
|
||||
|
||||
, glib
|
||||
, nss
|
||||
, nspr
|
||||
, atk
|
||||
, at-spi2-atk
|
||||
, libdrm
|
||||
, expat
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
, libX11
|
||||
, libXcomposite
|
||||
, libXdamage
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libXrandr
|
||||
, mesa
|
||||
, gtk3
|
||||
, pango
|
||||
, cairo
|
||||
, alsa-lib
|
||||
, dbus
|
||||
, at-spi2-core
|
||||
, cups
|
||||
, libxshmfence
|
||||
, udev
|
||||
}:
|
||||
|
||||
assert !stdenv.isDarwin;
|
||||
# I can't test darwin
|
||||
|
||||
let rpath = lib.makeLibraryPath [
|
||||
glib
|
||||
nss
|
||||
nspr
|
||||
atk
|
||||
at-spi2-atk
|
||||
libdrm
|
||||
expat
|
||||
libxcb
|
||||
libxkbcommon
|
||||
libX11
|
||||
libXcomposite
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXrandr
|
||||
mesa
|
||||
gtk3
|
||||
pango
|
||||
cairo
|
||||
alsa-lib
|
||||
dbus
|
||||
at-spi2-core
|
||||
cups
|
||||
libxshmfence
|
||||
udev
|
||||
];
|
||||
|
||||
buildType = if debugBuild then "Debug" else "Release";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "jcef-jetbrains";
|
||||
rev = "153d40c761a25a745d7ebf0ee3a024bbc2c840b5";
|
||||
commit-num = "611"; # Run `git rev-list --count HEAD`
|
||||
|
||||
nativeBuildInputs = [ cmake python3 jdk17 git rsync ant ninja ];
|
||||
buildInputs = [ libX11 libXdamage nss nspr ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetbrains";
|
||||
repo = "jcef";
|
||||
inherit rev;
|
||||
hash = "sha256-Vud4nIT2c7uOK7GKKw3plf41WzKqhg+2xpIwB/LyqnE=";
|
||||
};
|
||||
cef-bin = let
|
||||
fileName = "cef_binary_104.4.26+g4180781+chromium-104.0.5112.102_linux64_minimal";
|
||||
urlName = builtins.replaceStrings ["+"] ["%2B"] fileName;
|
||||
in fetchzip rec {
|
||||
name = fileName;
|
||||
url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2";
|
||||
hash = "sha256-0PAWWBR+9TO8hhejydWz8R6Df3d9A/Mb0VL8stlPz5Q=";
|
||||
};
|
||||
clang-fmt = fetchurl {
|
||||
url = "https://storage.googleapis.com/chromium-clang-format/942fc8b1789144b8071d3fc03ff0fcbe1cf81ac8";
|
||||
hash = "sha256-5iAU49tQmLS7zkS+6iGT+6SEdERRo1RkyRpiRvc9nVY=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
patchShebangs .
|
||||
|
||||
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}/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
|
||||
|
||||
sed \
|
||||
-e 's|os.path.isdir(os.path.join(path, \x27.git\x27))|True|' \
|
||||
-e 's|"%s rev-parse %s" % (git_exe, branch)|"echo '${rev}'"|' \
|
||||
-e 's|"%s config --get remote.origin.url" % git_exe|"echo 'https://github.com/jetbrains/jcef'"|' \
|
||||
-e 's|"%s rev-list --count %s" % (git_exe, branch)|"echo '${commit-num}'"|' \
|
||||
-i tools/git_util.py
|
||||
|
||||
cp ${clang-fmt} tools/buildtools/linux64/clang-format
|
||||
chmod +w tools/buildtools/linux64/clang-format
|
||||
|
||||
mkdir jcef_build
|
||||
cd jcef_build
|
||||
|
||||
cmake -G "Ninja" -DPROJECT_ARCH="x86_64" -DCMAKE_BUILD_TYPE=${buildType} ..
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
outputs = [ "out" "unpacked" ];
|
||||
|
||||
postBuild = ''
|
||||
export JCEF_ROOT_DIR=$(realpath ..)
|
||||
../tools/compile.sh linux64 Release
|
||||
'';
|
||||
|
||||
# Mostly taken from jb/tools/common/create_modules.sh
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
export JCEF_ROOT_DIR=$(realpath ..)
|
||||
export OUT_NATIVE_DIR=$JCEF_ROOT_DIR/jcef_build/native/${buildType}
|
||||
export JB_TOOLS_DIR=$(realpath ../jb/tools)
|
||||
export JB_TOOLS_OS_DIR=$JB_TOOLS_DIR/linux
|
||||
export OUT_CLS_DIR=$(realpath ../out/linux64)
|
||||
export TARGET_ARCH=x86_64 DEPS_ARCH=amd64
|
||||
export OS=linux
|
||||
export JOGAMP_DIR="$JCEF_ROOT_DIR"/third_party/jogamp/jar
|
||||
|
||||
mkdir -p $unpacked/{jogl,gluegen,jcef}
|
||||
|
||||
function extract_jar {
|
||||
__jar=$1
|
||||
__dst_dir=$2
|
||||
__content_dir="''${3:-.}"
|
||||
__tmp=.tmp_extract_jar
|
||||
rm -rf "$__tmp" && mkdir "$__tmp"
|
||||
(
|
||||
cd "$__tmp" || exit 1
|
||||
jar -xf "$__jar"
|
||||
)
|
||||
rm -rf "$__tmp/META-INF"
|
||||
rm -rf "$__dst_dir" && mkdir "$__dst_dir"
|
||||
if [ -z "$__content_dir" ]
|
||||
then
|
||||
cp -R "$__tmp"/* "$__dst_dir"
|
||||
else
|
||||
cp -R "$__tmp"/"$__content_dir"/* "$__dst_dir"
|
||||
fi
|
||||
rm -rf $__tmp
|
||||
}
|
||||
|
||||
cd $unpacked/gluegen
|
||||
cp "$JOGAMP_DIR"/gluegen-rt.jar .
|
||||
cp "$JB_TOOLS_DIR"/common/gluegen-module-info.java module-info.java
|
||||
javac --patch-module gluegen.rt=gluegen-rt.jar module-info.java
|
||||
jar uf gluegen-rt.jar module-info.class
|
||||
rm module-info.class module-info.java
|
||||
mkdir lib
|
||||
extract_jar "$JOGAMP_DIR"/gluegen-rt-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH"
|
||||
|
||||
cd ../jogl
|
||||
cp "$JOGAMP_DIR"/gluegen-rt.jar .
|
||||
cp "$JOGAMP_DIR"/jogl-all.jar .
|
||||
cp "$JB_TOOLS_OS_DIR"/jogl-module-info.java module-info.java
|
||||
javac --module-path . --patch-module jogl.all=jogl-all.jar module-info.java
|
||||
jar uf jogl-all.jar module-info.class
|
||||
rm module-info.class module-info.java
|
||||
mkdir lib
|
||||
extract_jar "$JOGAMP_DIR"/jogl-all-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH"
|
||||
|
||||
cd ../jcef
|
||||
cp "$OUT_CLS_DIR"/jcef.jar .
|
||||
mkdir lib
|
||||
cp -R "$OUT_NATIVE_DIR"/* lib
|
||||
|
||||
mkdir $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontStrip = debugBuild;
|
||||
|
||||
postFixup = ''
|
||||
cd $unpacked/gluegen
|
||||
jmod create --class-path gluegen-rt.jar --libs lib $out/gluegen.rt.jmod
|
||||
cd ../jogl
|
||||
jmod create --module-path . --class-path jogl-all.jar --libs lib $out/jogl.all.jmod
|
||||
cd ../jcef
|
||||
jmod create --module-path . --class-path jcef.jar --libs lib $out/jcef.jmod
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Jetbrains' fork of JCEF";
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "https://github.com/JetBrains/JCEF";
|
||||
};
|
||||
}
|
||||
@ -29363,6 +29363,7 @@ with pkgs;
|
||||
jdk = jetbrains.jdk;
|
||||
}) // {
|
||||
jdk = callPackage ../development/compilers/jetbrains-jdk { };
|
||||
jcef = callPackage ../development/compilers/jetbrains-jdk/jcef.nix { };
|
||||
});
|
||||
|
||||
jmusicbot = callPackage ../applications/audio/jmusicbot { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user