From 926f3eada8f2a45345781a7074f33fe5f25f2402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20J=C3=A4ger?= <jger.tm@gmail.com>
Date: Thu, 8 Jun 2017 11:26:42 -0700
Subject: [PATCH] buck: cleanup

---
 .../tools/build-managers/buck/default.nix     |  8 +++-----
 .../tools/build-managers/buck/pex-mtime.patch | 20 ++++++-------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index dadea794466a..bb21d34c957e 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, jre, makeWrapper }:
+{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }:
 
-
-let
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "buck-${version}";
   version = "v2017.05.31.01";
 
@@ -31,7 +29,7 @@ in stdenv.mkDerivation rec {
     install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck
     wrapProgram $out/bin/buck \
       --prefix PYTHONPATH : $PYTHONPATH \
-      --prefix PATH : "${stdenv.lib.makeBinPath [jre watchman]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/build-managers/buck/pex-mtime.patch b/pkgs/development/tools/build-managers/buck/pex-mtime.patch
index 01640f342ae4..b8726e64a604 100644
--- a/pkgs/development/tools/build-managers/buck/pex-mtime.patch
+++ b/pkgs/development/tools/build-managers/buck/pex-mtime.patch
@@ -1,21 +1,13 @@
 diff --git a/third-party/py/pex/pex/common.py b/third-party/py/pex/pex/common.py
-index 76459ce23..491dcfc0b 100644
+index 76459ce23..eff411b20 100644
 --- a/third-party/py/pex/pex/common.py
 +++ b/third-party/py/pex/pex/common.py
-@@ -12,6 +12,7 @@ import stat
- import sys
- import tempfile
- import threading
-+import time
- import zipfile
- from collections import defaultdict
- from uuid import uuid4
-@@ -328,4 +329,7 @@ class Chroot(object):
+@@ -328,4 +328,7 @@ class Chroot(object):
    def zip(self, filename, mode='wb'):
      with contextlib.closing(zipfile.ZipFile(filename, mode)) as zf:
        for f in sorted(self.files()):
 -        zf.write(os.path.join(self.chroot, f), arcname=f, compress_type=zipfile.ZIP_DEFLATED)
-+        file = os.path.join(self.chroot, f)
-+        instant = 315532800
-+        os.utime(file, (instant, instant))
-+        zf.write(file, arcname=f, compress_type=zipfile.ZIP_DEFLATED)
++        path = os.path.join(self.chroot, f)
++        instant = 615532801
++        os.utime(path, (instant, instant))
++        zf.write(path, arcname=f, compress_type=zipfile.ZIP_DEFLATED)