Skip to content

Commit d4f247e

Browse files
authored
tomato-c: 2023-8-21 → 2024-4-19 (#347360)
2 parents 1be07e5 + 304eea6 commit d4f247e

File tree

1 file changed

+19
-24
lines changed

1 file changed

+19
-24
lines changed

pkgs/by-name/to/tomato-c/package.nix

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,29 @@
1-
{ lib
2-
, stdenv
3-
, fetchFromGitHub
4-
, fetchpatch
5-
, libnotify
6-
, makeWrapper
7-
, mpv
8-
, ncurses
9-
, pkg-config
1+
{
2+
lib,
3+
stdenv,
4+
fetchFromGitHub,
5+
fetchpatch,
6+
libnotify,
7+
makeWrapper,
8+
mpv,
9+
ncurses,
10+
pkg-config,
1011
}:
1112

1213
stdenv.mkDerivation (finalAttrs: {
1314
pname = "tomato-c";
14-
version = "unstable-2023-08-21";
15+
version = "0-unstable-2024-04-19";
1516

1617
src = fetchFromGitHub {
1718
owner = "gabrielzschmitz";
1819
repo = "Tomato.C";
19-
rev = "6e43e85aa15f3d96811311a3950eba8ce9715634";
20-
hash = "sha256-RpKkQ7xhM2XqfZdXra0ju0cTBL3Al9NMVQ/oleFydDs=";
20+
rev = "b3b85764362a7c120f3312f5b618102a4eac9f01";
21+
hash = "sha256-7i+vn1dAK+bAGpBlKTnSBUpyJyRiPc7AiUF/tz+RyTI=";
2122
};
2223

23-
patches = [
24-
# Adds missing function declarations required by newer versions of clang.
25-
(fetchpatch {
26-
url = "https://github.com/gabrielzschmitz/Tomato.C/commit/ad6d4c385ae39d655a716850653cd92431c1f31e.patch";
27-
hash = "sha256-3ormv59Ce4rOmeyL30QET3CCUIOrRYMquub+eIQsMW8=";
28-
})
29-
];
30-
3124
postPatch = ''
3225
substituteInPlace Makefile \
3326
--replace-fail "sudo " ""
34-
# Need to define _ISOC99_SOURCE to use `snprintf` on Darwin
35-
substituteInPlace config.mk \
36-
--replace-fail -D_POSIX_C_SOURCE -D_ISOC99_SOURCE
3727
substituteInPlace notify.c \
3828
--replace-fail "/usr/local" "${placeholder "out"}"
3929
substituteInPlace util.c \
@@ -65,7 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
6555
postFixup = ''
6656
for file in $out/bin/*; do
6757
wrapProgram $file \
68-
--prefix PATH : ${lib.makeBinPath [ libnotify mpv ]}
58+
--prefix PATH : ${
59+
lib.makeBinPath [
60+
libnotify
61+
mpv
62+
]
63+
}
6964
done
7065
'';
7166

0 commit comments

Comments
 (0)