This commit is contained in:
12
flake.lock
generated
12
flake.lock
generated
@@ -5,11 +5,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -20,11 +20,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1720863214,
|
||||
"narHash": "sha256-i2MaeZlmE85eZtILHzZdb0blm15xcq7ASbhHa8ILiLI=",
|
||||
"lastModified": 1764934844,
|
||||
"narHash": "sha256-P+MyCHPVEXUB7j1lQCjWo6Ke9/SGkKCWbyyVeXkude8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "267ce10433ba68de208074a2faf9d31f048593f3",
|
||||
"rev": "1177aa56e17909379c74d86c60d51f92f2f1e8e4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
11
jdk.nix
11
jdk.nix
@@ -1,18 +1,14 @@
|
||||
{
|
||||
buildPlatform,
|
||||
hostPlatform,
|
||||
stdenv,
|
||||
jdk21,
|
||||
which,
|
||||
zip,
|
||||
buildPackages,
|
||||
}:
|
||||
if buildPlatform == hostPlatform
|
||||
if stdenv.buildPlatform == stdenv.hostPlatform
|
||||
then jdk21
|
||||
else
|
||||
(jdk21.override {
|
||||
# libIDL does not compile in cross-compile scenarios.
|
||||
enableGnome2 = false;
|
||||
}).overrideAttrs (old: {
|
||||
jdk21.overrideAttrs (old: {
|
||||
# lol, nixpkgs can’t get pkgs right
|
||||
# AUTOCONF = "${autoconf}/bin/autoconf";
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [which zip];
|
||||
@@ -21,7 +17,6 @@ else
|
||||
old.configureFlags
|
||||
++ [
|
||||
"--with-jtreg=no"
|
||||
"--disable-hotspot-gtest"
|
||||
"--with-build-jdk=${buildPackages.jdk21}"
|
||||
];
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user