From fbfa29a8676b07203801c83e184c0bb0652a2827 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Fri, 24 May 2024 09:37:55 +0200 Subject: [PATCH] tryna build with java --- flake.nix | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 538215b..87c1ca3 100644 --- a/flake.nix +++ b/flake.nix @@ -10,32 +10,47 @@ , nixpkgs , maven , makeWrapper + , ... }: let - javaVersion = 22; overlays = [ (final: prev: rec { - jdk = prev."jdk${toString javaVersion}"; - gradle = prev.gradle.override { java = jdk; }; + jdk = prev."jdk22"; maven = prev.maven.override { inherit jdk; }; }) ]; - supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + + supportedSystems = [ + "x86_64-linux" + "aarch64-linux" + ]; + forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f { pkgs = import nixpkgs { inherit overlays system; }; }); in { - hydraJobs = { - gateway = maven.buildMavenPackage rec { - pname = "learningpulse-gateway"; - version = "1.2.1"; - # - # hello i wrote something here to test pulling + packages = { + + learningpulse-discovery = with lib; maven.buildMavenPackage { + pname = "learningpulse-discovery"; + version = "1.1.1"; + + src = ./eurika; + # todo get hash from package + mvnHash = lib.fakeSha256; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/jd-cli + install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli + + makeWrapper ${nixpkgs.pkgs.jre8}/bin/java $out/bin/jd-cli \ + --add-flags "-jar $out/share/jd-cli/jd-cli.jar" + ''; }; }; - devShells = forEachSupportedSystem ({ pkgs }: { default = pkgs.mkShell { packages = with pkgs; [