From 9f7bb1f512ba305ed5b0bf0132dd3f50b158a517 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 3 Jun 2019 12:22:40 -0400
Subject: [PATCH 1/3] python27: add override to build statically

---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 4 +++-
 pkgs/top-level/static.nix                                    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 894a9b084c6..bc90d93a7e3 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -22,6 +22,7 @@
 , sourceVersion
 , sha256
 , passthruFun
+, static ? false
 }:
 
 assert x11Support -> tcl != null
@@ -164,7 +165,8 @@ let
   ]
     # Never even try to use lchmod on linux,
     # don't rely on detecting glibc-isms.
-  ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
+  ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"
+  ++ optional static "LDFLAGS=-static";
 
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index ada3c2a5034..43220f724be 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -161,4 +161,6 @@ in {
     };
   };
 
+  python27 = super.python27.override { static = true; };
+
 }

From 6c9977f753698f23e505441038d0077420bc2757 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 3 Jun 2019 12:23:02 -0400
Subject: [PATCH 2/3] waf: only add crossFlags when hostPlatform.system ==
 targetPlatform

waf fails otherwise in some weird CHECK_UNAME things

Fixes #62540
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3af78b9f552..731cdb9b148 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6716,7 +6716,7 @@ in
     deps = [ python ];
     substitutions = {
       inherit waf;
-      crossFlags = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform)
+      crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system)
         ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"'';
     };
   } ../development/tools/build-managers/waf/setup-hook.sh;

From cc582920f27383bb45f5f381b528d31400cc7db4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 3 Jun 2019 12:27:21 -0400
Subject: [PATCH 3/3] proot: 20190305 -> 20190510

---
 pkgs/tools/system/proot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index c8028ed74a7..79b86f1383c 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "proot";
-  version = "5.1.0.20190305";
+  version = "20190510";
 
   src = fetchFromGitHub {
     repo = "proot";
     owner = "proot-me";
-    rev = "ff61c86cb26f71c06af22574d9d4cc3a77292781";
-    sha256 = "0qink34bjv0lshf3c8997w39r8yxgbhxpjbxw47l5xkvimlpc0dl";
+    rev = "803e54d8a1b3d513108d3fc413ba6f7c80220b74";
+    sha256 = "0gwzqm5wpscj3fchlv3qggf3zzn0v00s4crb5ciwljan1zrqadhy";
   };
 
   postPatch = ''