commit 97dd661ca84a76462bfa30d5c3bec37a86b1b205
parent cfbdba2a91555693499b8d641a35462f7a7cd89d
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 11 May 2020 00:46:48 +0300
i18n-editor: minor fix
Diffstat:
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -117,7 +117,7 @@ lib.makeScope newScope (
gt4gd = python3Packages.callPackage ./tools/dict/gt4gd {
inherit sources;
};
- i18n-editor = callPackage ./tools/i18n-editor {};
+ i18n-editor = callPackage ./tools/i18n-editor { jre = pkgs.jdk11; };
imgdecode = callPackage ./tools/geo/imgdecode {};
ish = callPackage ./tools/networking/ish {};
morse-talk = python3Packages.callPackage ./tools/morse-talk {
diff --git a/pkgs/tools/i18n-editor/default.nix b/pkgs/tools/i18n-editor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, jdk11, makeWrapper }:
+{ stdenv, fetchzip, jre, makeWrapper }:
stdenv.mkDerivation rec {
pname = "i18n-editor";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
stripRoot = false;
};
- buildInputs = [ jdk11 makeWrapper ];
+ buildInputs = [ jre makeWrapper ];
installPhase = ''
install -dm755 $out/bin
install -Dm644 i18n-editor.jar -t $out/share/java
- makeWrapper ${jdk11}/bin/java $out/bin/i18n-editor \
+ makeWrapper ${jre}/bin/java $out/bin/i18n-editor \
--add-flags "-jar $out/share/java/i18n-editor.jar"
'';