diff options
| author | Domen Kožar <domen@dev.si> | 2016-03-11 19:27:07 +0000 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-03-11 19:27:07 +0000 |
| commit | 2d38f13f4c1f45a4831a2df9facc2b28b851f1fa (patch) | |
| tree | d2e74d36e6d1da5902b5f3e3cdef4e5ec8b98412 /pkgs | |
| parent | 1ba4e7a365125ab77bbbdf3e56620b471a57f466 (diff) | |
| parent | 8b7adf808e6e068fbeaba3e0d5d294347e1ea727 (diff) | |
| download | nixlib-2d38f13f4c1f45a4831a2df9facc2b28b851f1fa.tar nixlib-2d38f13f4c1f45a4831a2df9facc2b28b851f1fa.tar.gz nixlib-2d38f13f4c1f45a4831a2df9facc2b28b851f1fa.tar.bz2 nixlib-2d38f13f4c1f45a4831a2df9facc2b28b851f1fa.tar.lz nixlib-2d38f13f4c1f45a4831a2df9facc2b28b851f1fa.tar.xz nixlib-2d38f13f4c1f45a4831a2df9facc2b28b851f1fa.tar.zst nixlib-2d38f13f4c1f45a4831a2df9facc2b28b851f1fa.zip | |
Merge pull request #13836 from kevincox/mesos-sh
mesos: Patch more executable paths.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/mesos/default.nix | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 86b82db60e14..b1b451855110 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -41,25 +41,43 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo} + + substituteInPlace 3rdparty/libprocess/include/process/subprocess.hpp \ + --replace '"sh"' '"${bash}/bin/bash"' + + substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp \ + --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp \ + --replace '"sh"' '"${bash}/bin/bash"' + + substituteInPlace src/cli/mesos-scp \ + --replace "'scp " "'${openssh}/bin/scp " + + substituteInPlace src/launcher/executor.cpp \ + --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace src/launcher/fetcher.cpp \ --replace '"gzip' '"${gzip}/bin/gzip' \ --replace '"tar' '"${gnutar}/bin/tar' \ --replace '"unzip' '"${unzip}/bin/unzip' - substituteInPlace src/cli/mesos-scp \ - --replace "'scp " "'${openssh}/bin/scp " - substituteInPlace src/python/cli/src/mesos/cli.py \ --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" + + substituteInPlace src/slave/containerizer/mesos/launch.cpp \ + --replace '"sh"' '"${bash}/bin/bash"' - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString stdenv.isLinux '' substituteInPlace configure.ac \ --replace /usr/include/libnl3 ${libnl}/include/libnl3 substituteInPlace src/linux/perf.cpp \ --replace '"perf ' '"${perf}/bin/perf ' + + substituteInPlace src/linux/systemd.cpp \ + --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"' substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \ --replace '"mount ' '"${utillinux}/bin/mount ' \ @@ -72,15 +90,6 @@ in stdenv.mkDerivation rec { --replace '"ip ' '"${iproute}/bin/ip ' \ --replace '"mount ' '"${utillinux}/bin/mount ' \ --replace '/bin/sh' "${stdenv.shell}" - - substituteInPlace src/launcher/executor.cpp \ - --replace '"sh"' '"${bash}/bin/bash"' - - substituteInPlace src/slave/containerizer/mesos/launch.cpp \ - --replace '"sh"' '"${bash}/bin/bash"' - - substituteInPlace src/linux/systemd.cpp \ - --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"' ''; configureFlags = [ |