diff --git a/modules/environment/login/default.nix b/modules/environment/login/default.nix
index 3fc31f3..5ae79a7 100644
--- a/modules/environment/login/default.nix
+++ b/modules/environment/login/default.nix
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE.
+# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
 
 { config, lib, pkgs, customPkgs, ... }:
 
@@ -85,8 +85,8 @@ in
       prootStatic =
         let
           crossCompiledPaths = {
-           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";
+           aarch64 = "/nix/store/0xfjhi3529lzym7z7025xs7kignmgy0r-proot-termux-aarch64-unknown-linux-android-unstable-2020-10-25";
+           i686 = "/nix/store/jl91v6ya3ablh8v41k63vcwsim5b4v1s-proot-termux-i686-unknown-linux-android-unstable-2020-10-25";
           };
         in
           "${crossCompiledPaths.${config.build.arch}}";
diff --git a/pkgs/cross-compiling/pkgs.nix b/pkgs/cross-compiling/pkgs.nix
index fec7ae6..013bc71 100644
--- a/pkgs/cross-compiling/pkgs.nix
+++ b/pkgs/cross-compiling/pkgs.nix
@@ -1,18 +1,23 @@
-# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE.
+# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
 
-{ config, libjpeg, path }:
+{ config, path }:
 
 let
   loadNixpkgs = import ../lib/load-nixpkgs.nix;
 
-  overlayJpegNoStatic = self: super: {
-    inherit libjpeg;
-  };
-
   crossSystem = {
     config = "${config.build.arch}-unknown-linux-android";
-    sdkVer = "24";
-    ndkVer = "18b";
+    ndkVer = "21";
+
+    # that one is cool because it could make its way on-device one day,
+    # but it currently isn't static-friendly:
+    #   sdkVer = "30";
+    #   libc = "bionic";
+    #   useAndroidPrebuilt = false;
+    #   useLLVM = true;
+
+    # use that one instead
+    sdkVer = "29";
     useAndroidPrebuilt = true;
   };
 in
@@ -25,7 +30,6 @@ in
 
     crossOverlays = [
       (import "${path}/pkgs/top-level/static.nix")
-      overlayJpegNoStatic
     ];
   };
 }
diff --git a/pkgs/lib/load-nixpkgs.nix b/pkgs/lib/load-nixpkgs.nix
index a9d7521..47811ff 100644
--- a/pkgs/lib/load-nixpkgs.nix
+++ b/pkgs/lib/load-nixpkgs.nix
@@ -1,29 +1,16 @@
-# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE.
+# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
 
 let
   defaultNixpkgsArgs = {
     config = { };
-    overlays = [
-      (self: super: {
-        gdb = super.gdb.override {
-          # actual default value of safePaths, but `lib` does not exist when cross-compiling:
-          # [
-          #   # $debugdir:$datadir/auto-load are whitelisted by default by GDB
-          #   "$debugdir" "$datadir/auto-load"
-          #   # targetPackages so we get the right libc when cross-compiling and using buildPackages.gdb
-          #   targetPackages.stdenv.cc.cc.lib
-          # ]
-          safePaths = [ "$debugdir" "$datadir/auto-load" ];
-        };
-      })
-    ];
+    overlays = [ ];
   };
 
-  # head of nixos-20.09 as of 2020-11-07
+  # head of nixos-21.05 as of 2021-06-24
   # note: when updating nixpkgs, update store paths of proot-termux in modules/environment/login/default.nix
   pinnedPkgsSrc = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/d105075a1fd870b1d1617a6008cb38b443e65433.tar.gz";
-    sha256 = "1jcs44wn0s6mlf2jps25bvcai1rij9b2dil6zcj8zqwf2i8xmqjh";
+    url = "https://github.com/NixOS/nixpkgs/archive/0b8b127125e5271f5c8636680b6fe274844aaa9d.tar.gz";
+    sha256 = "1rjb1q28ivaf20aqj3v60kzjyi5lqb3krag0k8wwjqch45ik2f86";
   };
 in