update sobercookie

This commit is contained in:
xunuwu 2024-09-14 22:52:29 +02:00
parent 126dcf014e
commit 7074198be5
Signed by: xun
SSH key fingerprint: SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
3 changed files with 10 additions and 16 deletions

View file

@ -16,7 +16,7 @@
}, },
"sobercookie": { "sobercookie": {
"cargoLocks": null, "cargoLocks": null,
"date": "2024-09-10", "date": "2024-09-14",
"extract": null, "extract": null,
"name": "sobercookie", "name": "sobercookie",
"passthru": null, "passthru": null,
@ -28,11 +28,11 @@
"name": null, "name": null,
"owner": "xunuwu", "owner": "xunuwu",
"repo": "sobercookie", "repo": "sobercookie",
"rev": "40b1f97f0614172a116ce27aa502275f3f8dc2c0", "rev": "35566d1a3354f0b9c975cc226b2eb49af0e088dc",
"sha256": "sha256-E/HJEDr0bBHQnMhtQckbJv+f4U/NVe8dQ6/y0ujSdjc=", "sha256": "sha256-DOGH4eMnYyFzwSzz9FZZx6Nmzc5npIQmYDzCQ7+K76Q=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "github" "type": "github"
}, },
"version": "40b1f97f0614172a116ce27aa502275f3f8dc2c0" "version": "35566d1a3354f0b9c975cc226b2eb49af0e088dc"
} }
} }

View file

@ -11,14 +11,14 @@
}; };
sobercookie = { sobercookie = {
pname = "sobercookie"; pname = "sobercookie";
version = "40b1f97f0614172a116ce27aa502275f3f8dc2c0"; version = "35566d1a3354f0b9c975cc226b2eb49af0e088dc";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xunuwu"; owner = "xunuwu";
repo = "sobercookie"; repo = "sobercookie";
rev = "40b1f97f0614172a116ce27aa502275f3f8dc2c0"; rev = "35566d1a3354f0b9c975cc226b2eb49af0e088dc";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-E/HJEDr0bBHQnMhtQckbJv+f4U/NVe8dQ6/y0ujSdjc="; sha256 = "sha256-DOGH4eMnYyFzwSzz9FZZx6Nmzc5npIQmYDzCQ7+K76Q=";
}; };
date = "2024-09-10"; date = "2024-09-14";
}; };
} }

View file

@ -1,14 +1,12 @@
{ {
stdenv, stdenv,
gnugrep,
lib, lib,
pkg-config, pkg-config,
flatpak, flatpak,
procps, procps,
bash, bash,
jq, perl,
gnused, gnused,
libnotify,
coreutils, coreutils,
makeWrapper, makeWrapper,
luajitPackages, luajitPackages,
@ -38,7 +36,6 @@ stdenv.mkDerivation (nv_generated.sobercookie
mkdir -p $out/bin mkdir -p $out/bin
cp sobercookie $out/bin/sobercookie cp sobercookie $out/bin/sobercookie
cp sobercookie_service $out/bin/sobercookie_service
cp launcher.lua $out/bin/sobercookie-launcher cp launcher.lua $out/bin/sobercookie-launcher
mkdir -p $out/share/applications mkdir -p $out/share/applications
@ -55,10 +52,7 @@ stdenv.mkDerivation (nv_generated.sobercookie
''; '';
postFixup = '' 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 \ wrapProgram $out/bin/sobercookie \
--prefix PATH : ${lib.makeBinPath [flatpak bash coreutils procps]}:$out/bin --prefix PATH : ${lib.makeBinPath [flatpak bash coreutils procps gnused perl]}:$out/bin
''; '';
})) }))