From d293d66678fc6c037a8e7d62b39fcda1bba34b0e Mon Sep 17 00:00:00 2001 From: xunuwu Date: Fri, 13 Sep 2024 08:42:43 +0200 Subject: [PATCH] update sobercookie --- _sources/generated.json | 8 ++++---- _sources/generated.nix | 8 ++++---- pkgs/sobercookie/default.nix | 13 ++++++++++++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index 6c37f93..45e100c 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -16,7 +16,7 @@ }, "sobercookie": { "cargoLocks": null, - "date": "2024-09-08", + "date": "2024-09-10", "extract": null, "name": "sobercookie", "passthru": null, @@ -28,11 +28,11 @@ "name": null, "owner": "xunuwu", "repo": "sobercookie", - "rev": "0e082ab538a2eed206ab228ed50c5251323abdf2", - "sha256": "sha256-hdW/MqzphyAy6bcN3LDFFRV0t9ZHOx2b96hu9acZ7+E=", + "rev": "40b1f97f0614172a116ce27aa502275f3f8dc2c0", + "sha256": "sha256-E/HJEDr0bBHQnMhtQckbJv+f4U/NVe8dQ6/y0ujSdjc=", "sparseCheckout": [], "type": "github" }, - "version": "0e082ab538a2eed206ab228ed50c5251323abdf2" + "version": "40b1f97f0614172a116ce27aa502275f3f8dc2c0" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 4f62fee..b28e064 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -11,14 +11,14 @@ }; sobercookie = { pname = "sobercookie"; - version = "0e082ab538a2eed206ab228ed50c5251323abdf2"; + version = "40b1f97f0614172a116ce27aa502275f3f8dc2c0"; src = fetchFromGitHub { owner = "xunuwu"; repo = "sobercookie"; - rev = "0e082ab538a2eed206ab228ed50c5251323abdf2"; + rev = "40b1f97f0614172a116ce27aa502275f3f8dc2c0"; fetchSubmodules = false; - sha256 = "sha256-hdW/MqzphyAy6bcN3LDFFRV0t9ZHOx2b96hu9acZ7+E="; + sha256 = "sha256-E/HJEDr0bBHQnMhtQckbJv+f4U/NVe8dQ6/y0ujSdjc="; }; - date = "2024-09-08"; + date = "2024-09-10"; }; } diff --git a/pkgs/sobercookie/default.nix b/pkgs/sobercookie/default.nix index 3997134..dacd214 100644 --- a/pkgs/sobercookie/default.nix +++ b/pkgs/sobercookie/default.nix @@ -1,8 +1,15 @@ { stdenv, + gnugrep, lib, pkg-config, + flatpak, + procps, bash, + jq, + gnused, + libnotify, + coreutils, makeWrapper, luajitPackages, gobject-introspection, @@ -31,6 +38,7 @@ stdenv.mkDerivation (nv_generated.sobercookie mkdir -p $out/bin cp sobercookie $out/bin/sobercookie + cp sobercookie_service $out/bin/sobercookie_service cp launcher.lua $out/bin/sobercookie-launcher mkdir -p $out/share/applications @@ -47,7 +55,10 @@ stdenv.mkDerivation (nv_generated.sobercookie ''; postFixup = '' + wrapProgram $out/bin/sobercookie_service \ + --prefix PATH : ${lib.makeBinPath [bash jq libnotify coreutils procps gnugrep gnused]} ## sudo is assumed to be installed + wrapProgram $out/bin/sobercookie \ - --prefix PATH : ${lib.makeBinPath [bash]} + --prefix PATH : ${lib.makeBinPath [flatpak bash coreutils procps]}:$out/bin ''; }))