treewide: Use makeBinPath

pkgs/development/tools/continuous-integration/buildkite-agent/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/share/bootstrap.sh \
       --replace "#!/bin/bash" "#!$(type -P bash)"
     wrapProgram $out/bin/buildkite-agent \
-      --set PATH '"${openssh}/bin/:${git}/bin:${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:$PATH"'
+      --set PATH '"${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}:$PATH"'
   '';
 
   meta = {

pkgs/development/tools/continuous-integration/cide/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     makeWrapper ${env}/bin/cide $out/bin/cide \
-      --set PATH ${docker}/bin:${git}/bin:${gnutar}/bin:${gzip}/bin
+      --set PATH ${stdenv.lib.makeBinPath [ docker git gnutar gzip ]}
   '';
 
   meta = with lib; {