opa: Use makeBinPath

pkgs/development/compilers/opa/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   # Paths so the opa compiler code generation will use the same programs as were
   # used to build opa.
-  codeGeneratorPaths = "${ocamlPackages.ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin:${nodejs}/bin";
+  codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
 
   preConfigure = ''
     patchShebangs .

pkgs/development/tools/misc/distcc/masq.nix

@@ -3,10 +3,6 @@
 stdenv.mkDerivation {
   name = "distcc-masq-${gccRaw.name}";
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-  };
-
   phases = [ "installPhase" ];
   installPhase = ''
     mkdir -p $out/bin
@@ -40,6 +36,9 @@ stdenv.mkDerivation {
         ln -sf $bbin/*-as $out/bin/as
       done
     fi
-    
   '';
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
 }