BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #226242 from K900/bad-jdk

Browse source 
openjdk: explicitly specify build platform to avoid WSL autodetection shenanigans
This commit is contained in:
K900 2023-04-15 22:14:04 +03:00 committed by GitHub
commit e8757cd84e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/compilers/openjdk/13.nix
View file

@ -61,6 +61,11 @@ let
patchShebangs --build configure
'';
# JDK's build system attempts to specifically detect
# and special-case WSL, and we don't want it to do that,
# so pass the correct platform names explicitly
configurePlatforms = ["build" "host"];
configureFlags = [
"--with-boot-jdk=${openjdk-bootstrap.home}"
"--with-version-pre="

5
pkgs/development/compilers/openjdk/14.nix
View file

@ -56,6 +56,11 @@ let
patchShebangs --build configure
'';
# JDK's build system attempts to specifically detect
# and special-case WSL, and we don't want it to do that,
# so pass the correct platform names explicitly
configurePlatforms = ["build" "host"];
configureFlags = [
"--with-boot-jdk=${openjdk-bootstrap.home}"
"--with-version-pre="

5
pkgs/development/compilers/openjdk/15.nix
View file

@ -59,6 +59,11 @@ let
patchShebangs --build configure
'';
# JDK's build system attempts to specifically detect
# and special-case WSL, and we don't want it to do that,
# so pass the correct platform names explicitly
configurePlatforms = ["build" "host"];
configureFlags = [
"--with-boot-jdk=${openjdk-bootstrap.home}"
"--with-version-pre="

5
pkgs/development/compilers/openjdk/16.nix
View file

@ -61,6 +61,11 @@ let
patchShebangs --build configure
'';
# JDK's build system attempts to specifically detect
# and special-case WSL, and we don't want it to do that,
# so pass the correct platform names explicitly
configurePlatforms = ["build" "host"];
configureFlags = [
"--with-boot-jdk=${openjdk-bootstrap.home}"
"--with-version-build=${version.build}"

5
pkgs/development/compilers/openjdk/17.nix
View file

@ -78,6 +78,11 @@ let
patchShebangs --build configure
'';
# JDK's build system attempts to specifically detect
# and special-case WSL, and we don't want it to do that,
# so pass the correct platform names explicitly
configurePlatforms = ["build" "host"];
configureFlags = [
"--with-boot-jdk=${openjdk-bootstrap.home}"
"--with-version-build=${version.build}"

5
pkgs/development/compilers/openjdk/18.nix
View file

@ -68,6 +68,11 @@ let
patchShebangs --build configure
'';
# JDK's build system attempts to specifically detect
# and special-case WSL, and we don't want it to do that,
# so pass the correct platform names explicitly
configurePlatforms = ["build" "host"];
configureFlags = [
"--with-boot-jdk=${openjdk-bootstrap.home}"
"--with-version-build=${version.build}"

5
pkgs/development/compilers/openjdk/19.nix
View file

@ -80,6 +80,11 @@ let
patchShebangs --build configure
'';
# JDK's build system attempts to specifically detect
# and special-case WSL, and we don't want it to do that,
# so pass the correct platform names explicitly
configurePlatforms = ["build" "host"];
configureFlags = [
"--with-boot-jdk=${openjdk-bootstrap.home}"
"--with-version-build=${version.build}"