pyrox.dev
FreeBSD patches for GNU m4, stdenv, miniupnpc
+2
-1
pkgs/development/tools/misc/gnum4/default.nix
+2
-1
pkgs/development/tools/misc/gnum4/default.nix
+94
pkgs/stdenv/native/default.nix
+94
pkgs/stdenv/native/default.nix
···
24
alias make=gmake
25
alias tar=gtar
26
alias sed=gsed
27
+
28
+
alias patch=gpatch # pcre relied on this for patching binary files
29
+
30
+
# we need GNU cp for --reflink, need to alias all of coreutils
31
+
alias basename=gbasename
32
+
alias cat=gcat
33
+
alias chgrp=gchgrp
34
+
alias chmod=gchmod
35
+
alias chown=gchown
36
+
alias chroot=gchroot
37
+
alias cksum=gcksum
38
+
alias comm=gcomm
39
+
alias cp=gcp
40
+
alias csplit=gcsplit
41
+
alias cut=gcut
42
+
alias date=gdate
43
+
alias dd=gdd
44
+
alias df=gdf
45
+
alias dir=gdir
46
+
alias dircolors=gdircolors
47
+
alias dirname=gdirname
48
+
alias du=gdu
49
+
alias echo=gecho
50
+
alias env=genv
51
+
alias expand=gexpand
52
+
alias expr=gexpr
53
+
alias factor=gfactor
54
+
alias false=gfalse
55
+
alias fmt=gfmt
56
+
alias fold=gfold
57
+
alias groups=ggroups
58
+
alias head=ghead
59
+
alias hostid=ghostid
60
+
alias hostname=ghostname
61
+
alias id=gid
62
+
alias install=ginstall
63
+
alias join=gjoin
64
+
alias kill=gkill
65
+
alias link=glink
66
+
alias ln=gln
67
+
alias logname=glogname
68
+
alias ls=gls
69
+
alias md5sum=gmd5sum
70
+
alias mkdir=gmkdir
71
+
alias mkfifo=gmkfifo
72
+
alias mknod=gmknod
73
+
alias mv=gmv
74
+
alias nice=gnice
75
+
alias nl=gnl
76
+
alias nohup=gnohup
77
+
alias od=god
78
+
alias paste=gpaste
79
+
alias pathchk=gpathchk
80
+
alias pinky=gpinky
81
+
alias pr=gpr
82
+
alias printenv=gprintenv
83
+
alias printf=gprintf
84
+
alias ptx=gptx
85
+
alias pwd=gpwd
86
+
alias readlink=greadlink
87
+
alias rm=grm
88
+
alias rmdir=grmdir
89
+
alias seq=gseq
90
+
alias sha1sum=gsha1sum
91
+
alias shred=gshred
92
+
alias sleep=gsleep
93
+
alias sort=gsort
94
+
alias split=gsplit
95
+
alias stat=gstat
96
+
alias stty=gstty
97
+
alias su=gsu
98
+
alias sum=gsum
99
+
alias sync=gsync
100
+
alias tac=gtac
101
+
#alias tail=gtail # this breaks xz XXX
102
+
alias tee=gtee
103
+
alias test=gtest
104
+
alias touch=gtouch
105
+
alias tr=gtr
106
+
alias true=gtrue
107
+
alias tsort=gtsort
108
+
alias tty=gtty
109
+
alias uname=guname
110
+
alias unexpand=gunexpand
111
+
alias uniq=guniq
112
+
alias unlink=gunlink
113
+
alias uptime=guptime
114
+
alias users=gusers
115
+
alias vdir=gvdir
116
+
alias wc=gwc
117
+
alias who=gwho
118
+
alias whoami=gwhoami
119
+
alias yes=gyes
120
+
121
export MAKE=gmake
122
shopt -s expand_aliases
123
'';
+9
-8
pkgs/tools/networking/miniupnpc/default.nix
+9
-8
pkgs/tools/networking/miniupnpc/default.nix
···
1
-
{ stdenv, fetchFromGitHub }:
2
3
-
let version = "24d54ba13af4e53aba19c23898a373feecb41bd0"; in
4
stdenv.mkDerivation rec {
5
name = "miniupnpc-${version}";
6
7
-
src = fetchFromGitHub {
8
-
owner = "miniupnp";
9
-
repo = "miniupnp";
10
-
sha256 = "0j78dvlfh1a3a27zhvv001cb1d7vcgyv33bd1zr36drg64b6hrgw";
11
-
rev = version;
12
};
13
14
-
doCheck = true;
15
16
installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
17
···
1
+
{ stdenv, fetchurl }:
2
3
+
let version = "1.9.20150430"; in
4
stdenv.mkDerivation rec {
5
name = "miniupnpc-${version}";
6
7
+
src = fetchurl {
8
+
url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
9
+
sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
10
+
name = "${name}.tar.gz";
11
};
12
13
+
patches = stdenv.lib.optional stdenv.isFreeBSD [ ./freebsd.patch ];
14
+
15
+
doCheck = !stdenv.isFreeBSD;
16
17
installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
18
+11
pkgs/tools/networking/miniupnpc/freebsd.patch
+11
pkgs/tools/networking/miniupnpc/freebsd.patch
···
···
1
+
diff --git a/minihttptestserver.c b/minihttptestserver.c
2
+
index bbfdac3..a43999d 100644
3
+
--- a/minihttptestserver.c
4
+
+++ b/minihttptestserver.c
5
+
@@ -1,3 +1,6 @@
6
+
+#ifndef INADDR_LOOPBACK
7
+
+#define INADDR_LOOPBACK 0x7f000001
8
+
+#endif
9
+
/* $Id: minihttptestserver.c,v 1.17 2015/02/06 10:31:19 nanard Exp $ */
10
+
/* Project : miniUPnP
11
+
* Author : Thomas Bernard