diff options
| author | Jiajie Chen <c@jia.je> | 2022-08-02 21:18:28 +0800 |
|---|---|---|
| committer | Jiajie Chen <c@jia.je> | 2022-08-04 08:15:34 +0800 |
| commit | a04107a0af75c6a7f7f9830dc22df6b91895886a (patch) | |
| tree | 0156bcfa2f81319f7ca874e3419a5b8265f2ed2f | |
| parent | 7b5ac19d7b5f6e029001b101cab7b73b7a45ed71 (diff) | |
| download | nixpkgs-a04107a0af75c6a7f7f9830dc22df6b91895886a.tar nixpkgs-a04107a0af75c6a7f7f9830dc22df6b91895886a.tar.gz nixpkgs-a04107a0af75c6a7f7f9830dc22df6b91895886a.tar.bz2 nixpkgs-a04107a0af75c6a7f7f9830dc22df6b91895886a.tar.lz nixpkgs-a04107a0af75c6a7f7f9830dc22df6b91895886a.tar.xz nixpkgs-a04107a0af75c6a7f7f9830dc22df6b91895886a.tar.zst nixpkgs-a04107a0af75c6a7f7f9830dc22df6b91895886a.zip | |
foremost: unbreak on Darwin
Support darwin build and add jiegec as maintainer.
| -rw-r--r-- | pkgs/tools/system/foremost/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/system/foremost/makefile.patch | 17 |
2 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index 1d0a2fa3188..f3b353501ff 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # ld: api.o:(.bss+0xbdba0): multiple definition of `wildcard'; main.o:(.bss+0xbd760): first defined here NIX_CFLAGS_COMPILE = "-fcommon"; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "mac" ]; enableParallelBuilding = true; @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://foremost.sourceforge.net/"; license = licenses.publicDomain; - platforms = platforms.linux; + maintainers = [ maintainers.jiegec ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/system/foremost/makefile.patch b/pkgs/tools/system/foremost/makefile.patch index 6626c9520ec..3166fffe73f 100644 --- a/pkgs/tools/system/foremost/makefile.patch +++ b/pkgs/tools/system/foremost/makefile.patch @@ -1,6 +1,15 @@ ---- a/Makefile 2015-04-21 00:40:46.949266581 +0200 -+++ b/Makefile 2015-04-21 00:41:38.637165883 +0200 -@@ -24,9 +24,9 @@ +diff --git a/Makefile b/Makefile +index 1a20f4f..077acdb 100755 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + +-RAW_CC = gcc ++RAW_CC := $(CC) + RAW_FLAGS = -Wall -O2 + LINK_OPT = + VERSION = 1.5.7 +@@ -24,9 +24,9 @@ MAN_PAGES = $(NAME).8.gz RAW_FLAGS += -DVERSION=\"$(VERSION)\" # Where we get installed @@ -13,7 +22,7 @@ # Setup for compiling and cross-compiling for Windows # The CR_ prefix refers to cross compiling from OSX to Windows CR_CC = $(CR_BASE)/gcc -@@ -120,7 +120,6 @@ +@@ -120,7 +120,6 @@ foremost: $(OBJ) install: goals install -m 755 $(NAME) $(BIN) install -m 444 $(MAN_PAGES) $(MAN) |