diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-31 20:51:34 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-31 20:51:34 +0000 |
| commit | 63c7b4f9a7844f0bc84d008b810375eb0fba6b2f (patch) | |
| tree | e351ecd702d87ab1c4fd03246383162ec19d6de2 /pkgs/applications/networking/cluster/mesos/default.nix | |
| parent | 43ba8d295f414ab985bd3fc5d5125421bd8bd0ad (diff) | |
| parent | a629cd3f02c2ad071e58d5898c5f48fb0336a705 (diff) | |
| download | nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.gz nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.bz2 nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.lz nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.xz nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.zst nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/networking/cluster/mesos/default.nix')
| -rw-r--r-- | pkgs/applications/networking/cluster/mesos/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 89337901f97c..27c31443f120 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -48,6 +48,9 @@ in stdenv.mkDerivation rec { substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp \ --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/shell.hpp \ + --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp \ --replace '"sh"' '"${bash}/bin/bash"' |