diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2017-05-31 23:57:15 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2017-05-31 23:57:15 +0100 |
commit | d7f6367471f69f3bf14e1c846bd031bf918783f4 (patch) | |
tree | 41b19b4e031d49d19702d4c6faca19ee7bc0cd6d /pkgs/tools | |
parent | bef0b67a84ea847cc0c07143bc7cbf7a06ea7b9f (diff) | |
download | nixlib-d7f6367471f69f3bf14e1c846bd031bf918783f4.tar nixlib-d7f6367471f69f3bf14e1c846bd031bf918783f4.tar.gz nixlib-d7f6367471f69f3bf14e1c846bd031bf918783f4.tar.bz2 nixlib-d7f6367471f69f3bf14e1c846bd031bf918783f4.tar.lz nixlib-d7f6367471f69f3bf14e1c846bd031bf918783f4.tar.xz nixlib-d7f6367471f69f3bf14e1c846bd031bf918783f4.tar.zst nixlib-d7f6367471f69f3bf14e1c846bd031bf918783f4.zip |
daemontools: fix build
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/daemontools/default.nix | 22 | ||||
-rw-r--r-- | pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch | 10 |
2 files changed, 22 insertions, 10 deletions
diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index 5594368b04f4..7e8c1bccc3e8 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -2,40 +2,42 @@ stdenv.mkDerivation rec { name = "daemontools-0.76"; - + src = fetchurl { url = "https://cr.yp.to/daemontools/${name}.tar.gz"; sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"; }; - + + patches = [ ./fix-nix-usernamespace-build.patch ]; + configurePhase = '' cd ${name} - + sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc - + substituteInPlace src/Makefile \ --replace '/bin/sh' '${bash}/bin/bash -oxtrace' - + sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests - + cat ${glibc.dev}/include/errno.h ''; - + buildPhase = '' package/compile ''; - + installPhase = '' for cmd in $(cat package/commands); do install -Dm755 "command/$cmd" "$out/bin/$cmd" done ''; - + meta = { license = stdenv.lib.licenses.publicDomain; homepage = https://cr.yp.to/daemontools.html; description = "A collection of tools for managing UNIX services."; - + maintainers = with stdenv.lib.maintainers; [ kevincox ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch b/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch new file mode 100644 index 000000000000..9b784e7ca112 --- /dev/null +++ b/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch @@ -0,0 +1,10 @@ +--- admin.org/daemontools-0.76/src/chkshsgr.c 2001-07-12 17:49:49.000000000 +0100 ++++ admin/daemontools-0.76/src/chkshsgr.c 2017-05-31 23:54:56.662174028 +0100 +@@ -4,6 +4,7 @@ + + int main() + { ++ return 0; + short x[4]; + + x[0] = x[1] = 0; |