Merge pull request #239254 from wirew0rm/pkgs/scenebuilder
scenebuilder: 15.0.1 -> 20.0.0, enable javaFX and webkit
This commit is contained in:
Weijia Wang
GitHub
commit
abb697a0cd
3 changed files with 52 additions and 88 deletions
|
|
@ -1,69 +1,59 @@
|
|||
{ lib, stdenv, fetchFromGitHub, jdk11, gradle_6, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
|
||||
let
|
||||
gradle = gradle_6;
|
||||
{ lib, stdenv, fetchFromGitHub, openjdk20, maven, makeDesktopItem, copyDesktopItems, makeWrapper, glib, wrapGAppsHook }:
|
||||
|
||||
let
|
||||
jdk = openjdk20.override (lib.optionalAttrs stdenv.isLinux {
|
||||
enableJavaFX = true;
|
||||
});
|
||||
maven' = maven.override {
|
||||
inherit jdk;
|
||||
};
|
||||
selectSystem = attrs:
|
||||
attrs.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
in
|
||||
maven'.buildMavenPackage rec {
|
||||
pname = "scenebuilder";
|
||||
version = "15.0.1";
|
||||
version = "20.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gluonhq";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0dqlpfgr9qpmk62zsnhzw4q6n0swjqy00294q0kb4djp3jn47iz4";
|
||||
hash = "sha256-Og+dzkJ6+YH0fD4HJw8gUKGgvQuNw17BxgzZMP/bEA0=";
|
||||
};
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps";
|
||||
inherit src;
|
||||
|
||||
nativeBuildInputs = [ jdk11 perl gradle ];
|
||||
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d);
|
||||
gradle --no-daemon build -x test
|
||||
'';
|
||||
|
||||
# Mavenize dependency paths
|
||||
# e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar
|
||||
installPhase = ''
|
||||
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
|
||||
| sh
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "01dkayad68g3zpzdnjwrc0h6s7s6n619y5b576snc35l8g2r5sgd";
|
||||
buildDate = "2022-10-07T00:00:00+01:00"; # v20.0.0 release date
|
||||
mvnParameters = "-Dmaven.test.skip -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
|
||||
mvnHash = selectSystem {
|
||||
x86_64-linux = "sha256-3SFCQ+hyQPtAEx1jSbe/Qtq4dYkfVvU/Kmekzv53o3U=";
|
||||
aarch64-linux = "sha256-AZ1NXzSRyT77W+EjLIb7eWxf7Ztu6XuKjSImRg1lNcw=";
|
||||
};
|
||||
|
||||
# Point to our local deps repo
|
||||
gradleInit = writeText "init.gradle" ''
|
||||
settingsEvaluated { settings ->
|
||||
settings.pluginManagement {
|
||||
repositories {
|
||||
clear()
|
||||
maven { url '${deps}' }
|
||||
}
|
||||
}
|
||||
}
|
||||
logger.lifecycle 'Replacing Maven repositories with ${deps}...'
|
||||
gradle.projectsLoaded {
|
||||
rootProject.allprojects {
|
||||
buildscript {
|
||||
repositories {
|
||||
clear()
|
||||
maven { url '${deps}' }
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
clear()
|
||||
maven { url '${deps}' }
|
||||
}
|
||||
}
|
||||
}
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper glib wrapGAppsHook ];
|
||||
|
||||
dontWrapGApps = true; # prevent double wrapping
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/java $out/share/{${pname},icons/hicolor/128x128/apps}
|
||||
cp app/target/lib/scenebuilder-${version}-SNAPSHOT-all.jar $out/share/java/${pname}.jar
|
||||
|
||||
cp app/src/main/resources/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
postFixup = ''
|
||||
makeWrapper ${jdk}/bin/java $out/bin/${pname} \
|
||||
--add-flags "--add-modules javafx.web,javafx.fxml,javafx.swing,javafx.media" \
|
||||
--add-flags "--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED" \
|
||||
--add-flags "-cp $out/share/java/${pname}.jar" \
|
||||
--add-flags "com.oracle.javafx.scenebuilder.app.SceneBuilderApp" \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
'';
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
name = "scenebuilder";
|
||||
exec = "scenebuilder";
|
||||
icon = "scenebuilder";
|
||||
|
|
@ -71,39 +61,7 @@ let
|
|||
desktopName = "Scene Builder";
|
||||
mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ];
|
||||
categories = [ "Development" ];
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname src version;
|
||||
|
||||
nativeBuildInputs = [ jdk11 gradle makeWrapper glib wrapGAppsHook ];
|
||||
|
||||
dontWrapGApps = true; # prevent double wrapping
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
gradle -PVERSION=${version} --offline --no-daemon --info --init-script ${gradleInit} build -x test
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/{${pname},icons/hicolor/128x128/apps}
|
||||
cp app/build/libs/SceneBuilder-${version}-all.jar $out/share/${pname}/${pname}.jar
|
||||
cp app/build/resources/main/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${jdk11}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar" "''${gappsWrapperArgs[@]}"
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
}) ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
|
|
@ -118,3 +76,4 @@ in stdenv.mkDerivation rec {
|
|||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{ lib, stdenv, fetchFromGitHub, jdk, gradle_7, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper }:
|
||||
{ lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, perl, writeText, makeWrapper }:
|
||||
let
|
||||
jdk = openjdk.override (lib.optionalAttrs stdenv.isLinux {
|
||||
enableJavaFX = true;
|
||||
openjfx = openjfx.override { withWebKit = true; };
|
||||
});
|
||||
|
||||
pname = "scenic-view";
|
||||
version = "11.0.2";
|
||||
|
||||
|
|
|
|||
|
|
@ -19873,7 +19873,7 @@ with pkgs;
|
|||
|
||||
scenebuilder = callPackage ../development/tools/scenebuilder { };
|
||||
|
||||
scenic-view = callPackage ../development/tools/scenic-view { jdk = jdk11; };
|
||||
scenic-view = callPackage ../development/tools/scenic-view { };
|
||||
|
||||
shncpd = callPackage ../tools/networking/shncpd { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue