mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-01 02:23:54 +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.
40 lines
1004 B
Diff
40 lines
1004 B
Diff
--- rig-1.11.orig/Makefile
|
|
+++ rig-1.11/Makefile
|
|
@@ -1,20 +1,21 @@
|
|
-PREFIX=/usr/local
|
|
+PREFIX=${out}
|
|
BINDIR=${PREFIX}/bin
|
|
MANDIR=${PREFIX}/man
|
|
DATADIR=${PREFIX}/share/rig
|
|
+CXX=g++
|
|
|
|
all: rig rig.6
|
|
rig: rig.cc
|
|
- g++ -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
|
|
+ ${CXX} -O2 -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
|
|
|
|
rig.6: rig.6.in
|
|
sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6
|
|
|
|
install: rig rig.6
|
|
- install -g 0 -m 755 -o 0 -s rig $(BINDIR)
|
|
- install -g 0 -m 644 -o 0 rig.6 $(MANDIR)/man6/rig.6
|
|
- install -g 0 -m 755 -o 0 -d $(DATADIR)
|
|
- install -g 0 -m 644 -o 0 data/*.idx $(DATADIR)
|
|
+ install -m 755 -d $(DESTDIR)$(DATADIR)
|
|
+ install -m 755 -d $(DESTDIR)$(BINDIR)
|
|
+ install -m 755 rig $(DESTDIR)$(BINDIR)/rig
|
|
+ install -m 644 data/*.idx $(DESTDIR)$(DATADIR)
|
|
|
|
clean:
|
|
rm -rf *~ *.rej *.orig *.o rig rig.6
|
|
--- rig-1.11.orig/rig.cc
|
|
+++ rig-1.11/rig.cc
|
|
@@ -26,6 +26,7 @@
|
|
#include <time.h>
|
|
#include <errno.h>
|
|
#include <assert.h>
|
|
+#include <string.h>
|
|
|
|
using namespace std;
|