Merge pull request #26479 from jgertm/jgertm/buck

buck: build buckd as well
NixOS · Jun 9, 2017 · fdf43dd · fdf43dd
2 parents cc9a72a + cfe23e1
commit fdf43dd
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
@@ -20,16 +20,23 @@ stdenv.mkDerivation rec {
   buildInputs = [ jdk ant python2 watchman python2Packages.pywatchman ];
   nativeBuildInputs = [ makeWrapper ];
 
+  targets = [ "buck" "buckd" ];
+
   buildPhase = ''
     ant
-    ./bin/buck build buck
+
+    for exe in ${toString targets}; do
+      ./bin/buck build //programs:$exe
+    done
   '';
 
   installPhase = ''
-    install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck
-    wrapProgram $out/bin/buck \
-      --prefix PYTHONPATH : $PYTHONPATH \
-      --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}"
+    for exe in ${toString targets}; do
+      install -D -m755 buck-out/gen/programs/$exe.pex $out/bin/$exe
+      wrapProgram $out/bin/$exe \
+        --prefix PYTHONPATH : $PYTHONPATH \
+        --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}"
+    done
   '';
 
   meta = with stdenv.lib; {