b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

scenebuilder: fix build error

Browse source
This commit is contained in:
sophrosyne97 2021-05-19 12:56:59 -04:00 committed by Jonathan Ringer
parent 5e52c3706c
commit 7af24d098c
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }: { lib, stdenv, fetchFromGitHub, jdk11, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
let let
# The default one still uses jdk8 (#89731) gradle = (gradleGen.override (old: { java = jdk11; })).gradle_6_8;
gradle = (gradleGen.override (old: { java = jdk; })).gradle_6_8;
pname = "scenebuilder"; pname = "scenebuilder";
version = "15.0.1"; version = "15.0.1";
@ -17,7 +16,7 @@ let
name = "${pname}-deps"; name = "${pname}-deps";
inherit src; inherit src;
nativeBuildInputs = [ jdk perl gradle ]; nativeBuildInputs = [ jdk11 perl gradle ];
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d); export GRADLE_USER_HOME=$(mktemp -d);
@ -77,7 +76,7 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
inherit pname src version; inherit pname src version;
nativeBuildInputs = [ jdk gradle makeWrapper glib wrapGAppsHook ]; nativeBuildInputs = [ jdk11 gradle makeWrapper glib wrapGAppsHook ];
dontWrapGApps = true; # prevent double wrapping dontWrapGApps = true; # prevent double wrapping
@ -101,7 +100,7 @@ in stdenv.mkDerivation rec {
''; '';
postFixup = '' postFixup = ''
makeWrapper ${jdk}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar" "''${gappsWrapperArgs[@]}" makeWrapper ${jdk11}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar" "''${gappsWrapperArgs[@]}"
''; '';
desktopItems = [ desktopItem ]; desktopItems = [ desktopItem ];