djbdns: fix build in usernamespaces

2017-10-13 10:07:56 +01:00 · 2017-10-13 10:07:56 +01:00 · 6ec6af4625
commit 6ec6af4625
parent 2864bc8fd9
2 changed files with 12 additions and 2 deletions
--- a/pkgs/tools/networking/djbdns/default.nix
+++ b/pkgs/tools/networking/djbdns/default.nix
@ -18,7 +18,7 @@ stdenv.mkDerivation {
    sha256 = "0j3baf92vkczr5fxww7rp1b7gmczxmmgrqc8w2dy7kgk09m85k9w";
  };

-  patches = [ ./hier.patch ];
+  patches = [ ./hier.patch ./fix-nix-usernamespace-build.patch ];

  postPatch = ''
    echo gcc -O2 -include ${glibc.dev}/include/errno.h > conf-cc
--- a/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch
+++ b/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch
@ -0,0 +1,10 @@
+--- djbdns-1.05.org/chkshsgr.c	2001-02-11 21:11:45.000000000 +0000
+++ djbdns-1.05/chkshsgr.c	2017-10-13 10:06:09.392578927 +0100
+@@ -2,6 +2,7 @@
+ 
+ int main()
+ {
+  return 0;
+   short x[4];
+ 
+   x[0] = x[1] = 0;