pyrox.dev
Revert "libfaketime: 0.9.10 -> 0.9.11"
This reverts commit abeb33f662ae92b2d9a2d3080c480aef3bff3b0d as it break texlive on darwin
ref. https://github.com/NixOS/nixpkgs/pull/413916
ref. https://github.com/wolfcw/libfaketime/issues/499
authored by Guilhem Saurel and committed by Bjørn Forsman bd23e609 11cfe3f8
+13
pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
+13
pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
···
1
+
diff --git a/src/Makefile b/src/Makefile
2
+
index 2af4804..bcff809 100644
3
+
--- a/src/Makefile
4
+
+++ b/src/Makefile
5
+
@@ -80,7 +80,7 @@ PREFIX ?= /usr/local
6
+
LIBDIRNAME ?= /lib/faketime
7
+
PLATFORM ?=$(shell uname)
8
+
9
+
-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
10
+
+CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
11
+
ifeq ($(PLATFORM),SunOS)
12
+
CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
13
+
endif
+20
-5
pkgs/by-name/li/libfaketime/package.nix
+20
-5
pkgs/by-name/li/libfaketime/package.nix
···
9
9
10
10
stdenv.mkDerivation rec {
11
11
pname = "libfaketime";
12
-
version = "0.9.11";
12
+
version = "0.9.10";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "wolfcw";
16
16
repo = "libfaketime";
17
17
rev = "v${version}";
18
-
sha256 = "sha256-a0TjHYzwbkRQyvr9Sj/DqjgLBnE1Z8kjsTQxTfGqLjE=";
18
+
sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ=";
19
19
};
20
20
21
-
patches = [
22
-
./nix-store-date.patch
23
-
];
21
+
patches =
22
+
[
23
+
./nix-store-date.patch
24
+
(fetchpatch {
25
+
name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch";
26
+
url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch";
27
+
sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo=";
28
+
})
29
+
(fetchpatch {
30
+
name = "LFS64.patch";
31
+
url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch";
32
+
hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g=";
33
+
})
34
+
]
35
+
++ (lib.optionals stdenv.cc.isClang [
36
+
# https://github.com/wolfcw/libfaketime/issues/277
37
+
./0001-Remove-unsupported-clang-flags.patch
38
+
]);
24
39
25
40
postPatch = ''
26
41
patchShebangs test src