From e8cd6ddf48e8ad6e74010a4781f299fcdedb9a5a Mon Sep 17 00:00:00 2001 From: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:09:27 +0200 Subject: [PATCH] swap back to raphiz's buildGradleApplication\n https://github.com/raphiz/buildGradleApplication/pull/19 is merged. This swaps back to the "original" project. Signed-off-by: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com> --- flake.lock | 18 +++++++++--------- flake.nix | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index df9d43c37..c9a5a5da1 100644 --- a/flake.lock +++ b/flake.lock @@ -6,15 +6,15 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1717826615, - "narHash": "sha256-JmtmbGfCveJgftCDwqzykymjO7V5Cr5XM9eeNIZ5YXs=", - "owner": "C0D3-M4513R", + "lastModified": 1718027491, + "narHash": "sha256-uShoiA4DvdSdLQxK4mWFiL4JMN37LfoX3DrdTj0OM9g=", + "owner": "raphiz", "repo": "buildGradleApplication", - "rev": "fd1bcc92ff1c778104a8585b20c624b96db02ec8", + "rev": "45be5a6dba3bb6e583aabf4f8acefa48bfacd389", "type": "github" }, "original": { - "owner": "C0D3-M4513R", + "owner": "raphiz", "repo": "buildGradleApplication", "type": "github" } @@ -54,16 +54,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717796960, - "narHash": "sha256-BKjQ9tQdsuoROrojHZb7KTAv95WprqCkNFvuzatfEo0=", + "lastModified": 1717696253, + "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8e0a5f16b7bf7f212be068dd302c49888c6ad68f", + "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 1a7fca716..1dd87fc8a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ # This must be the stable nixpkgs if you're running the app on a # stable NixOS install. Mixing EGL library versions doesn't work. nixpkgs.url = "github:lorenzleutgeb/nixpkgs/gradle-8.8"; - build-gradle-application.url = "github:C0D3-M4513R/buildGradleApplication"; + build-gradle-application.url = "github:raphiz/buildGradleApplication"; utils.url = "github:numtide/flake-utils"; flake-compat = { url = github:edolstra/flake-compat; @@ -42,7 +42,7 @@ devShell = with pkgs; mkShellNoCC { - buildInputs = [jdk openjfx22 gradle xorg.libxcb (updateVerificationMetadata { update_action = update_action; }) updateGradleVersion]; + buildInputs = [jdk openjfx22 gradle xorg.libxcb (updateVerificationMetadata.override { updateAction = update_action; })]; LD_LIBRARY_PATH = libPath; }; });