Fix jdk cross-compilation
This commit is contained in:
@@ -7,8 +7,8 @@
|
|||||||
outputs = { flake-utils, nixpkgs, ... }:
|
outputs = { flake-utils, nixpkgs, ... }:
|
||||||
let
|
let
|
||||||
overlay = final: prev: rec {
|
overlay = final: prev: rec {
|
||||||
jdk-openhab = final.jdk11;
|
jdk-openhab = final.callPackage ./jdk.nix {};
|
||||||
openhab = final.callPackage ./openhab.nix { inherit jdk-openhab; };
|
openhab = final.callPackage ./openhab.nix { };
|
||||||
openhab-addons = final.callPackage ./openhab-addons.nix {};
|
openhab-addons = final.callPackage ./openhab-addons.nix {};
|
||||||
};
|
};
|
||||||
pkgs = system: import nixpkgs { inherit system; overlays = [ overlay ]; };
|
pkgs = system: import nixpkgs { inherit system; overlays = [ overlay ]; };
|
||||||
|
|||||||
18
jdk.nix
Normal file
18
jdk.nix
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
{ buildPlatform, hostPlatform, jdk11, which, zip, buildPackages }:
|
||||||
|
|
||||||
|
if buildPlatform == hostPlatform
|
||||||
|
then jdk11
|
||||||
|
else (jdk11.override {
|
||||||
|
# libIDL does not compile in cross-compile scenarios.
|
||||||
|
enableGnome2 = false;
|
||||||
|
}).overrideAttrs (old: {
|
||||||
|
# lol, nixpkgs can’t get pkgs right
|
||||||
|
# AUTOCONF = "${autoconf}/bin/autoconf";
|
||||||
|
nativeBuildInputs = old.nativeBuildInputs ++ [ which zip ];
|
||||||
|
depsBuildBuild = with buildPackages; [ stdenv.cc autoconf ];
|
||||||
|
configureFlags = old.configureFlags ++ [
|
||||||
|
"--with-jtreg=no"
|
||||||
|
"--disable-hotspot-gtest"
|
||||||
|
"--with-build-jdk=${buildPackages.jdk11}"
|
||||||
|
];
|
||||||
|
})
|
||||||
Reference in New Issue
Block a user