mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-04 20:13:21 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
33 lines
865 B
Diff
33 lines
865 B
Diff
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
|
|
-BIN = /usr/local/bin
|
|
-MAN = /usr/share/man/man8
|
|
-CONF= /usr/local/etc
|
|
+BIN = $(PREFIX)/bin
|
|
+MAN = $(PREFIX)/share/man/man8
|
|
+CONF= $(PREFIX)/etc
|
|
# 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 @@ foremost: $(OBJ)
|
|
install: goals
|
|
install -m 755 $(NAME) $(BIN)
|
|
install -m 444 $(MAN_PAGES) $(MAN)
|
|
- install -m 444 foremost.conf $(CONF)
|
|
macinstall: BIN = /usr/local/bin/
|
|
macinstall: MAN = /usr/share/man/man1/
|
|
macinstall: CONF = /usr/local/etc/
|