diff --git a/flake.nix b/flake.nix index bf576f5..324048c 100644 --- a/flake.nix +++ b/flake.nix @@ -4,14 +4,21 @@ flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { flake-utils, nixpkgs, ... }: flake-utils.lib.eachDefaultSystem (system: { + outputs = { flake-utils, nixpkgs, ... }: + let + overlay = final: prev: rec { + jdk-openhab = final.jdk11; + openhab = final.callPackage ./openhab.nix { inherit jdk-openhab; }; + openhab-addons = final.callPackage ./openhab-addons.nix {}; + }; + pkgs = system: import nixpkgs { inherit system; overlays = [ overlay ]; }; + in { + inherit overlay; + } // flake-utils.lib.eachDefaultSystem (system: { packages = rec { - jdk-openhab = nixpkgs.legacyPackages.${system}.jdk11; - openhab = nixpkgs.legacyPackages.${system}.callPackage ./openhab.nix { - inherit jdk-openhab; - }; - openhab-addons = nixpkgs.legacyPackages.${system}.callPackage ./openhab-addons.nix {}; - default = openhab; + jdk-openhab = (pkgs system).jdk-openhab; + openhab = (pkgs system).openhab; + openhab-addons = (pkgs system).openhab-addons; }; }); }