pkgs: update proot and talloc

modules/environment/login/default.nix

@@ -85,8 +85,8 @@ in
       prootStatic =
         let
           crossCompiledPaths = {
-           aarch64 = "/nix/store/r9mavszgwsd2260a252i696fr7j69a3a-proot-termux-unstable-2020-04-25-aarch64-unknown-linux-android";
-           i686 = "/nix/store/wkzmc8ly7qgyrfi61pqsz31hxin9wmyz-proot-termux-unstable-2020-04-25-i686-unknown-linux-android";
+           aarch64 = "/nix/store/ly8ffgwwg7xsgqfcw865vdi0bqaj4vp9-proot-termux-unstable-2020-10-25-aarch64-unknown-linux-android";
+           i686 = "/nix/store/9kgif2f321vrbjd7x0pj7rcyg84zrhgz-proot-termux-unstable-2020-10-25-i686-unknown-linux-android";
           };
         in
           "${crossCompiledPaths.${config.build.arch}}";

pkgs/cross-compiling/proot-termux.nix

@@ -8,13 +8,13 @@ in
 
 pkgs.crossStatic.stdenv.mkDerivation {
   pname = "proot-termux";
-  version = "unstable-2020-04-25";
+  version = "unstable-2020-10-25";
 
   src = fetchFromGitHub {
     repo = "proot";
     owner = "termux";
-    rev = "b9588b1edff5069118c50f2f9b19397fce39f5c7";
-    sha256 = "0izs2vqbn7zaa0fxwr78p1kaa4f3k9rhv4g94zsmw38cqlmidv56";
+    rev = "66b34c6fb38983b09da3400b8bcf86005ebe8dd1";
+    sha256 = "0isrjcblkdkikw6l6f7a2p326vsy3plbs9ga48r20lpa8rsz4jnf";
   };
 
   buildInputs = [ tallocStatic ];

pkgs/cross-compiling/talloc-static.nix

@@ -1,46 +1,32 @@
 # Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE.
 
-{ callPackage, fetchurl, python2, zlib }:
+{ callPackage, fetchurl, python3, wafHook }:
 
 let
   pkgs = callPackage ./pkgs.nix { };
 in
 
-pkgs.cross.stdenv.mkDerivation rec {
-  name = "talloc-static-2.1.14";
+pkgs.cross.talloc.overrideAttrs (old: rec {
+  pname = "talloc-static";
+  version = "2.1.14";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://samba/talloc/${name}.tar.gz";
-    sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
-  };
+  nativeBuildInputs = [ python3 wafHook ];
+  buildInputs = [];
 
-  depsBuildBuild = [ python2 zlib ];
+  wafPath = "./buildtools/bin/waf";
+  wafConfigureFlags = [
+      "--disable-rpath"
+      "--disable-python"
+      "--cross-compile"
+      "--cross-answers=cross-answers.txt"
+  ];
 
-  buildDeps = [ pkgs.cross.zlib ];
-
-  configurePhase = ''
-    substituteInPlace buildtools/bin/waf \
-      --replace "/usr/bin/env python" "${python2}/bin/python"
-    ./configure --prefix=$out \
-      --disable-rpath \
-      --disable-python \
-      --cross-compile \
-      --cross-answers=cross-answers.txt
-  '';
-
-  buildPhase = ''
-    make
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib
-    make install
-    ${pkgs.cross.stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o
+  postInstall = ''
+    ${pkgs.cross.stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o
     rm -f $out/lib/libtalloc.so*
   '';
 
-  fixupPhase = "";
-
   prePatch = ''
     cat <<EOF > cross-answers.txt
     Checking uname sysname type: "Linux"
@@ -70,4 +56,4 @@ pkgs.cross.stdenv.mkDerivation rec {
     Checking getconf large file support flags work: OK
     EOF
   '';
-}
+})