Merge pull request #62618 from matthewbauer/talloc-fix

proot/talloc fixes

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 ++

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 = ''

pkgs/top-level/all-packages.nix

@@ -6714,7 +6714,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;

pkgs/top-level/static.nix

@@ -158,4 +158,6 @@ in {
     };
   };
 
+  python27 = super.python27.override { static = true; };
+
 }