Unverified Commit 4477eb2f authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

keyguard: 1.6.1 -> 1.6.2 (#347050)

parents 7563af84 50631a06

pkgs/by-name/ke/keyguard/deps.json

+7 −7
Original line number Diff line number Diff line
@@ -562,9 +562,9 @@ 
   "module": "sha256-+zlsWwe1d5qQ0kC9H2hm+B+ANhnjgTku0ZxxzeWjtw4=",

   "pom": "sha256-pLWsZsp+eXmLWodQv0wst1w49OU561YWT8m5wxPb354="

  },

  "androidx/profileinstaller#profileinstaller/1.4.0": {

   "module": "sha256-Ob+ZeijY7tLLMZgZ9vNSobo6eLnJeQBPvgXia499Fgs=",

   "pom": "sha256-1f45mBo7S3w5WFEw2gv8k4NQVMg0pDjT5j4GXl94vlU="

  "androidx/profileinstaller#profileinstaller/1.4.1": {

   "module": "sha256-bxHPZeS/hESZXMc+WqP4GwgtZucgwFkrxfyA0/c4UPc=",

   "pom": "sha256-bd5DgntAU15AU9HFLUsiekEVVsKJ5lQAyaHMYeK0HOM="

  },

  "androidx/room#room-common/2.6.1": {

   "module": "sha256-DqB+9xQ6tSYswOSOgvO63WrfFks3AasqwPbwmej2PTs=",
@@ -641,11 +641,11 @@ 
  "com/android/application#com.android.application.gradle.plugin/8.7.0": {

   "pom": "sha256-7h5ZwC4JeVS67atxKbxn0cANSSfoAFPMLT2TB1hiPQU="

  },

  "com/android/billingclient#billing-ktx/7.1.0": {

   "pom": "sha256-j0sHmA2e27XbWm6gZ01a8znZkylNFaleKlHzr6pKKdE="

  "com/android/billingclient#billing-ktx/7.1.1": {

   "pom": "sha256-PMPwTqj+PMOAi75eG0Y/3jQzM1RDOqeRERHQzK6Dt9g="

  },

  "com/android/billingclient#billing/7.1.0": {

   "pom": "sha256-OxlqMhxa5qAsnRjnu6t87dmLNrnxkEDk2LwIo52jh1I="

  "com/android/billingclient#billing/7.1.1": {

   "pom": "sha256-S+5D2uFUS1LoqOUCefEyBPcrve1/ECdDCbG4ekhLdgU="

  },

  "com/android/databinding#baseLibrary/8.7.0": {

   "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=",

pkgs/by-name/ke/keyguard/package.nix

+18 −14
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
  fetchFromGitHub,

  gradle,

  binutils,

  dpkg,

  fakeroot,

  jdk17,

  fontconfig,
@@ -17,31 +16,42 @@ 
  cups,

  lcms2,

  alsa-lib,

  makeDesktopItem,

  copyDesktopItems,

}:

let

  gradleBuildTask = ":desktopApp:packageDeb";

  gradleBuildTask = ":desktopApp:createDistributable";

  gradleUpdateTask = gradleBuildTask;

  desktopItems = [

    (makeDesktopItem {

      name = "Keyguard";

      exec = "Keyguard";

      icon = "Keyguard";

      comment = "Keyguard";

      desktopName = "Keyguard";

    })

  ];

in

stdenv.mkDerivation (finalAttrs: {

  pname = "keyguard";

  version = "1.6.1";

  version = "1.6.2";



  src = fetchFromGitHub {

    owner = "AChep";

    repo = "keyguard-app";

    rev = "25b505f7679e40bd42f5ff59218deb0f2aac2083";

    hash = "sha256-+WXeHcILukCheUzD59ffP+eMLXF8T5qm3NWNUugWIqg=";

    rev = "eb36b853a7ac67a0f72d5684e6751d41969b07dd";

    hash = "sha256-tMNc8OlYsiYmVtac2jngvrFZjgI7eNFVIxXUfIJUdK4=";

  };



  inherit gradleBuildTask gradleUpdateTask;

  inherit gradleBuildTask gradleUpdateTask desktopItems;



  nativeBuildInputs = [

    gradle

    binutils

    dpkg

    fakeroot

    jdk17

    autoPatchelfHook

    copyDesktopItems

  ];



  mitmCache = gradle.fetchDeps {
@@ -75,13 +85,7 @@ stdenv.mkDerivation (finalAttrs: { 
    runHook preInstall



    mkdir -p $out/

    dpkg -x ./desktopApp/build/compose/binaries/main/deb/*.deb $out

    mv $out/opt/keyguard/* -t $out/

    rm -r $out/opt

    install -Dm0644 $out/lib/*-Keyguard.desktop $out/share/applications/Keyguard.desktop

    substituteInPlace $out/share/applications/Keyguard.desktop \

      --replace-fail 'Exec=/opt/keyguard/bin/Keyguard' 'Exec=Keyguard' \

      --replace-fail 'Icon=/opt/keyguard/lib/Keyguard.png' 'Icon=Keyguard'

    cp -a ./desktopApp/build/compose/binaries/main/app/*/* $out/

    install -Dm0644 $out/lib/Keyguard.png $out/share/pixmaps/Keyguard.png



    runHook postInstall