From b57ceb67641617a0f3f7885c7f93ae0fa33d2e06 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Tue, 12 Jan 2021 01:09:15 +0100 Subject: [PATCH] Use jdk11 in nix packages --- nix/pkg.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nix/pkg.nix b/nix/pkg.nix index 322c4896..6ad5b564 100644 --- a/nix/pkg.nix +++ b/nix/pkg.nix @@ -1,4 +1,4 @@ -cfg: {stdenv, fetchzip, file, curl, inotifyTools, fetchurl, jre8, bash}: +cfg: {stdenv, fetchzip, file, curl, inotifyTools, fetchurl, jdk11, bash}: let meta = with stdenv.lib; { description = "Docspell helps to organize and archive your paper documents."; @@ -12,7 +12,7 @@ in src = fetchzip cfg.server; - buildInputs = [ jre8 ]; + buildInputs = [ jdk11 ]; buildPhase = "true"; @@ -21,7 +21,7 @@ in cp -R * $out/docspell-restserver-${cfg.version}/ cat > $out/bin/docspell-restserver <<-EOF #!${bash}/bin/bash - $out/docspell-restserver-${cfg.version}/bin/docspell-restserver -java-home ${jre8} "\$@" + $out/docspell-restserver-${cfg.version}/bin/docspell-restserver -java-home ${jdk11} "\$@" EOF chmod 755 $out/bin/docspell-restserver ''; @@ -34,7 +34,7 @@ in src = fetchzip cfg.joex; - buildInputs = [ jre8 ]; + buildInputs = [ jdk11 ]; buildPhase = "true"; @@ -43,7 +43,7 @@ in cp -R * $out/docspell-joex-${cfg.version}/ cat > $out/bin/docspell-joex <<-EOF #!${bash}/bin/bash - $out/docspell-joex-${cfg.version}/bin/docspell-joex -java-home ${jre8} "\$@" + $out/docspell-joex-${cfg.version}/bin/docspell-joex -java-home ${jdk11} "\$@" EOF chmod 755 $out/bin/docspell-joex '';