Unverified Commit b1586577 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

keyguard: 1.15.2 -> 2.1.0 (#474927)

parents 80da349c 34ac3e03
Loading
Loading
Loading
Loading
+1891 −2101

File changed.

Preview size limit exceeded, changes collapsed.

+12 −10
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
  gradle,
  gradle_9,
  jdk21,
  fontconfig,
  libXinerama,
@@ -17,17 +17,18 @@
  copyDesktopItems,
  libglvnd,
  autoPatchelfHook,
  writeText,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "keyguard";
  version = "1.15.2";
  version = "2.1.0";

  src = fetchFromGitHub {
    owner = "AChep";
    repo = "keyguard-app";
    tag = "r20251015";
    hash = "sha256-1e3AZ07CfRFj6b3hiJFcypsHFwhedRdQ3+StEHXSacU=";
    tag = "r20260102.2";
    hash = "sha256-LmK1FnMd8udAfkfe1QyJd0kVSUfs1xAmzTiz80USlpo=";
  };

  postPatch = ''
@@ -36,11 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
      --replace-fail 'resourcesTask.dependsOn(":desktopLibNative:''${Tasks.compileNativeUniversal}")' ""
  '';

  gradleBuildTask = ":desktopApp:createDistributable";
  gradleBuildTask = ":desktopApp:createReleaseDistributable";

  gradleUpdateTask = finalAttrs.gradleBuildTask;

  mitmCache = gradle.fetchDeps {
  gradleInitScript = writeText "empty-init-script.gradle" "";

  mitmCache = gradle_9.fetchDeps {
    inherit (finalAttrs) pname;
    data = ./deps.json;
    silent = false;
@@ -52,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
  gradleFlags = [ "-Dorg.gradle.java.home=${jdk21}" ];

  nativeBuildInputs = [
    gradle
    gradle_9
    jdk21
    copyDesktopItems
    autoPatchelfHook
@@ -78,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
      name = "keyguard";
      exec = "Keyguard";
      icon = "keyguard";
      comment = "Keyguard";
      desktopName = "Keyguard";
    })
  ];
@@ -86,8 +88,8 @@ stdenv.mkDerivation (finalAttrs: {
  installPhase = ''
    runHook preInstall

    cp -r desktopApp/build/compose/binaries/main/app/Keyguard $out
    install -Dm0644 $out/lib/Keyguard.png $out/share/pixmaps/keyguard.png
    cp --recursive desktopApp/build/compose/binaries/main-release/app/Keyguard $out
    install -D --mode=0644 $out/lib/Keyguard.png $out/share/icons/hicolor/512x512/apps/keyguard.png

    runHook postInstall
  '';