From 7cee92a1cc654dcf3c36422e6ea7d545fa6625d4 Mon Sep 17 00:00:00 2001 From: Sarunas Valaskevicius Date: Mon, 10 Aug 2020 14:41:01 +0100 Subject: [PATCH 1/3] openjdk11: add src.zip for IDEs --- pkgs/development/compilers/openjdk/11.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 5011fd39e2f..868b2b9cb61 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -77,6 +77,7 @@ let mkdir -p $out/lib mv build/*/images/jdk $out/lib/openjdk + mv build/*/support/src.zip $out/lib/src.zip # Remove some broken manpages. rm -rf $out/lib/openjdk/man/ja* From daadfcfb82470095f598c8d6862dee031706a636 Mon Sep 17 00:00:00 2001 From: Sarunas Valaskevicius Date: Tue, 29 Sep 2020 10:24:15 +0100 Subject: [PATCH 2/3] openjdk11: use symlink instead of another copy for src.zip --- pkgs/development/compilers/openjdk/11.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 868b2b9cb61..30b56ecba11 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -77,7 +77,6 @@ let mkdir -p $out/lib mv build/*/images/jdk $out/lib/openjdk - mv build/*/support/src.zip $out/lib/src.zip # Remove some broken manpages. rm -rf $out/lib/openjdk/man/ja* @@ -86,6 +85,7 @@ let mkdir -p $out/share ln -s $out/lib/openjdk/include $out/include ln -s $out/lib/openjdk/man $out/share/man + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ From 64a39be321ec5180a1dbd6e73349c55cd6fc641e Mon Sep 17 00:00:00 2001 From: Sarunas Valaskevicius Date: Tue, 29 Sep 2020 17:40:48 +0100 Subject: [PATCH 3/3] openjdk14: add symlink for src.zip --- pkgs/development/compilers/openjdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index e51e5540267..3dd74f73a7e 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -91,6 +91,7 @@ let mkdir -p $out/share ln -s $out/lib/openjdk/include $out/include ln -s $out/lib/openjdk/man $out/share/man + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/