nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

daemontools: fix build

+22 -10
+12 -10
pkgs/tools/admin/daemontools/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "daemontools-0.76"; 5 - 5 + 6 6 src = fetchurl { 7 7 url = "https://cr.yp.to/daemontools/${name}.tar.gz"; 8 8 sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"; 9 9 }; 10 - 10 + 11 + patches = [ ./fix-nix-usernamespace-build.patch ]; 12 + 11 13 configurePhase = '' 12 14 cd ${name} 13 - 15 + 14 16 sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc 15 - 17 + 16 18 substituteInPlace src/Makefile \ 17 19 --replace '/bin/sh' '${bash}/bin/bash -oxtrace' 18 - 20 + 19 21 sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests 20 - 22 + 21 23 cat ${glibc.dev}/include/errno.h 22 24 ''; 23 - 25 + 24 26 buildPhase = '' 25 27 package/compile 26 28 ''; 27 - 29 + 28 30 installPhase = '' 29 31 for cmd in $(cat package/commands); do 30 32 install -Dm755 "command/$cmd" "$out/bin/$cmd" 31 33 done 32 34 ''; 33 - 35 + 34 36 meta = { 35 37 license = stdenv.lib.licenses.publicDomain; 36 38 homepage = https://cr.yp.to/daemontools.html; 37 39 description = "A collection of tools for managing UNIX services."; 38 - 40 + 39 41 maintainers = with stdenv.lib.maintainers; [ kevincox ]; 40 42 platforms = stdenv.lib.platforms.unix; 41 43 };
+10
pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
··· 1 + --- admin.org/daemontools-0.76/src/chkshsgr.c 2001-07-12 17:49:49.000000000 +0100 2 + +++ admin/daemontools-0.76/src/chkshsgr.c 2017-05-31 23:54:56.662174028 +0100 3 + @@ -4,6 +4,7 @@ 4 + 5 + int main() 6 + { 7 + + return 0; 8 + short x[4]; 9 + 10 + x[0] = x[1] = 0;