pyrox.dev
lol
Merge pull request #184825 from jiegec/foremost-darwin
foremost: unbreak on Darwin
authored by
Sebastián Mancilla
and committed by
GitHub
d6865504
365557e0
+16
-6
+3
-2
pkgs/tools/system/foremost/default.nix
+3
-2
pkgs/tools/system/foremost/default.nix
···
16
16
# ld: api.o:(.bss+0xbdba0): multiple definition of `wildcard'; main.o:(.bss+0xbd760): first defined here
17
17
NIX_CFLAGS_COMPILE = "-fcommon";
18
18
19
-
makeFlags = [ "PREFIX=$(out)" ];
19
+
makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "mac" ];
20
20
21
21
enableParallelBuilding = true;
22
22
···
39
39
'';
40
40
homepage = "http://foremost.sourceforge.net/";
41
41
license = licenses.publicDomain;
42
-
platforms = platforms.linux;
42
+
maintainers = [ maintainers.jiegec ];
43
+
platforms = platforms.linux ++ platforms.darwin;
43
44
};
44
45
}
+13
-4
pkgs/tools/system/foremost/makefile.patch
+13
-4
pkgs/tools/system/foremost/makefile.patch
···
1
-
--- a/Makefile 2015-04-21 00:40:46.949266581 +0200
2
-
+++ b/Makefile 2015-04-21 00:41:38.637165883 +0200
3
-
@@ -24,9 +24,9 @@
1
+
diff --git a/Makefile b/Makefile
2
+
index 1a20f4f..077acdb 100755
3
+
--- a/Makefile
4
+
+++ b/Makefile
5
+
@@ -1,5 +1,5 @@
6
+
7
+
-RAW_CC = gcc
8
+
+RAW_CC := $(CC)
9
+
RAW_FLAGS = -Wall -O2
10
+
LINK_OPT =
11
+
VERSION = 1.5.7
12
+
@@ -24,9 +24,9 @@ MAN_PAGES = $(NAME).8.gz
4
13
RAW_FLAGS += -DVERSION=\"$(VERSION)\"
5
14
6
15
# Where we get installed
···
13
22
# Setup for compiling and cross-compiling for Windows
14
23
# The CR_ prefix refers to cross compiling from OSX to Windows
15
24
CR_CC = $(CR_BASE)/gcc
16
-
@@ -120,7 +120,6 @@
25
+
@@ -120,7 +120,6 @@ foremost: $(OBJ)
17
26
install: goals
18
27
install -m 755 $(NAME) $(BIN)
19
28
install -m 444 $(MAN_PAGES) $(MAN)