diff options
| author | sophrosyne97 <joshuaortiz@tutanota.com> | 2021-05-19 12:56:59 -0400 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-19 10:13:51 -0700 |
| commit | 7af24d098cdbf1d5c99dfb4f9a31f0d846319970 (patch) | |
| tree | 2e93bd791257452233cf8d45217a5b3f0c2d8a33 /pkgs/development/tools/scenebuilder | |
| parent | 5e52c3706cf03a8e62786879dc6c67d31e8d8b62 (diff) | |
| download | nixpkgs-7af24d098cdbf1d5c99dfb4f9a31f0d846319970.tar nixpkgs-7af24d098cdbf1d5c99dfb4f9a31f0d846319970.tar.gz nixpkgs-7af24d098cdbf1d5c99dfb4f9a31f0d846319970.tar.bz2 nixpkgs-7af24d098cdbf1d5c99dfb4f9a31f0d846319970.tar.lz nixpkgs-7af24d098cdbf1d5c99dfb4f9a31f0d846319970.tar.xz nixpkgs-7af24d098cdbf1d5c99dfb4f9a31f0d846319970.tar.zst nixpkgs-7af24d098cdbf1d5c99dfb4f9a31f0d846319970.zip | |
scenebuilder: fix build error
Diffstat (limited to 'pkgs/development/tools/scenebuilder')
| -rw-r--r-- | pkgs/development/tools/scenebuilder/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index 97c03fb4574..6bac5a95fcb 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -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 - # The default one still uses jdk8 (#89731) - gradle = (gradleGen.override (old: { java = jdk; })).gradle_6_8; + gradle = (gradleGen.override (old: { java = jdk11; })).gradle_6_8; pname = "scenebuilder"; version = "15.0.1"; @@ -17,7 +16,7 @@ let name = "${pname}-deps"; inherit src; - nativeBuildInputs = [ jdk perl gradle ]; + nativeBuildInputs = [ jdk11 perl gradle ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d); @@ -77,7 +76,7 @@ let in stdenv.mkDerivation rec { inherit pname src version; - nativeBuildInputs = [ jdk gradle makeWrapper glib wrapGAppsHook ]; + nativeBuildInputs = [ jdk11 gradle makeWrapper glib wrapGAppsHook ]; dontWrapGApps = true; # prevent double wrapping @@ -101,7 +100,7 @@ in stdenv.mkDerivation rec { ''; 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 ]; |