pyrox.dev
Merge pull request #247136 from xfix/flips-2023-03-15
flips: unstable-2021-10-28 -> unstable-2023-03-15
authored by
Weijia Wang
and committed by
GitHub
18036c0b
771ed6de
+3
-3
pkgs/tools/compression/flips/default.nix
+3
-3
pkgs/tools/compression/flips/default.nix
···
2
3
stdenv.mkDerivation {
4
pname = "flips";
5
-
version = "unstable-2021-10-28";
6
7
src = fetchFromGitHub {
8
owner = "Alcaro";
9
repo = "Flips";
10
-
rev = "3a8733e74c9bdbb6b89da2b45913a0be3d0e1866";
11
-
sha256 = "1jik580mz2spik5mgh60h93ryaj5x8dffncnr1lwija0v803xld7";
12
};
13
14
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
···
2
3
stdenv.mkDerivation {
4
pname = "flips";
5
+
version = "unstable-2023-03-15";
6
7
src = fetchFromGitHub {
8
owner = "Alcaro";
9
repo = "Flips";
10
+
rev = "fdd5c6e34285beef5b9be759c9b91390df486c66";
11
+
hash = "sha256-uuHgpt7aWqiMTUILm5tAEGGeZrls3g/DdylYQgsfpTw=";
12
};
13
14
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
+4
-4
pkgs/tools/compression/flips/use-system-libdivsufsort.patch
+4
-4
pkgs/tools/compression/flips/use-system-libdivsufsort.patch
···
1
diff --git a/Makefile b/Makefile
2
-
index c9d8b6d..9d66b0b 100644
3
--- a/Makefile
4
+++ b/Makefile
5
-
@@ -79,9 +79,7 @@ endif
6
-
MOREFLAGS := $(CFLAGS_$(TARGET))
7
8
9
-
-DIVSUF := libdivsufsort-2.0.1
10
-SOURCES += $(DIVSUF)/lib/divsufsort.c $(DIVSUF)/lib/sssort.c $(DIVSUF)/lib/trsort.c
11
-MOREFLAGS += -I$(DIVSUF)/include -DHAVE_CONFIG_H -D__STDC_FORMAT_MACROS
12
+MOREFLAGS += -ldivsufsort
···
1
diff --git a/Makefile b/Makefile
2
+
index b3d5aeb..a5acc08 100644
3
--- a/Makefile
4
+++ b/Makefile
5
+
@@ -83,9 +83,7 @@ endif
6
7
+
MOREFLAGS := $(CFLAGS_$(TARGET))
8
9
+
-DIVSUF := $(SRCDIR)/libdivsufsort-2.0.1
10
-SOURCES += $(DIVSUF)/lib/divsufsort.c $(DIVSUF)/lib/sssort.c $(DIVSUF)/lib/trsort.c
11
-MOREFLAGS += -I$(DIVSUF)/include -DHAVE_CONFIG_H -D__STDC_FORMAT_MACROS
12
+MOREFLAGS += -ldivsufsort