BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scenebuilder: 19.0.0 -> 20.0.0

Browse source
This commit is contained in:
Weijia Wang 2023-08-05 19:12:48 +02:00
parent d02a90fd17
commit b881156cec
3 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/development/tools/scenebuilder/default.nix
View file

@ -1,22 +1,35 @@
{ lib, stdenv, fetchFromGitHub, jre, maven, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
maven.buildMavenPackage rec {
{ 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 = "19.0.0"; # 20.0.0 already available but needs java20 which is not available in nixpkgs yet
version = "20.0.0";
src = fetchFromGitHub {
owner = "gluonhq";
repo = pname;
rev = version;
hash = "sha256-No0yMAVmM5T++h74ZZIufaHmJBOzYhI0EtfOEGWGzis=";
hash = "sha256-Og+dzkJ6+YH0fD4HJw8gUKGgvQuNw17BxgzZMP/bEA0=";
};
inherit jre;
buildDate = "2022-10-07T00:00:00+01:00"; # v20.0.0 release date
mvnParameters = "-Dmaven.test.skip -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
mvnHash = "sha256-G4WjQVRawNITSGh/e+fb6fVe80WSd0swT3uPIQOlif4=";
mvnHash = selectSystem {
x86_64-linux = "sha256-3SFCQ+hyQPtAEx1jSbe/Qtq4dYkfVvU/Kmekzv53o3U=";
aarch64-linux = "sha256-AZ1NXzSRyT77W+EjLIb7eWxf7Ztu6XuKjSImRg1lNcw=";
};
nativeBuildInputs = [ copyDesktopItems maven makeWrapper glib wrapGAppsHook ];
nativeBuildInputs = [ copyDesktopItems makeWrapper glib wrapGAppsHook ];
dontWrapGApps = true; # prevent double wrapping
@ -32,7 +45,7 @@ maven.buildMavenPackage rec {
'';
postFixup = ''
makeWrapper ${jre}/bin/java $out/bin/${pname} \
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" \

7
pkgs/development/tools/scenic-view/default.nix
View file

@ -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";

11
pkgs/top-level/all-packages.nix
View file

@ -19859,16 +19859,9 @@ with pkgs;
schemaspy = callPackage ../development/tools/database/schemaspy { };
scenebuilder = callPackage ../development/tools/scenebuilder {
jre = jre.override { enableJavaFX = true; };
};
scenebuilder = callPackage ../development/tools/scenebuilder { };
scenic-view = callPackage ../development/tools/scenic-view {
jdk = jdk.override {
enableJavaFX = true;
openjfx = openjfx.override { withWebKit = true; };
};
};
scenic-view = callPackage ../development/tools/scenic-view { };
shncpd = callPackage ../tools/networking/shncpd { };