diff --git a/modules/environment/login/default.nix b/modules/environment/login/default.nix index 5ae79a7..5096904 100644 --- a/modules/environment/login/default.nix +++ b/modules/environment/login/default.nix @@ -85,8 +85,8 @@ in prootStatic = let crossCompiledPaths = { - 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"; + aarch64 = "/nix/store/7j051wmlb19l8f89v78kmv52bbsz5b6l-proot-termux-aarch64-unknown-linux-android-unstable-2021-05-19"; + i686 = "/nix/store/nbgaw5xm6q5iv43p374h0p0qfdm1cmcz-proot-termux-i686-unknown-linux-android-unstable-2021-05-19"; }; in "${crossCompiledPaths.${config.build.arch}}"; diff --git a/pkgs/cross-compiling/proot-termux.nix b/pkgs/cross-compiling/proot-termux.nix index 3621ae1..4898ffe 100644 --- a/pkgs/cross-compiling/proot-termux.nix +++ b/pkgs/cross-compiling/proot-termux.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. { callPackage, fetchFromGitHub, tallocStatic }: @@ -8,20 +8,25 @@ in pkgs.crossStatic.stdenv.mkDerivation { pname = "proot-termux"; - version = "unstable-2020-10-25"; + version = "unstable-2021-05-19"; src = fetchFromGitHub { repo = "proot"; owner = "termux"; - rev = "66b34c6fb38983b09da3400b8bcf86005ebe8dd1"; - sha256 = "0isrjcblkdkikw6l6f7a2p326vsy3plbs9ga48r20lpa8rsz4jnf"; + rev = "3b7369b8eb8b2a879aade2b403b3ac0eb848b9ed"; # the one with make fix + sha256 = "1wrrar08axfwrma7yp2zlf61cz4crypr3m1jnhkqng7p1pry1cay"; + + # 1 step behind 6f12fbee "Implement shmat", use if ashmem.h is missing + #rev = "ffd811ee726c62094477ed335de89fc107cadf17"; + #sha256 = "1zjblclsybvsrjmq2i0z6prhka268f0609w08dh9vdrbrng117f8"; + }; buildInputs = [ tallocStatic ]; patches = [ ./proot-detranslate-empty.patch ]; - makeFlags = [ "-Csrc CFLAGS=-D__ANDROID__" ]; + makeFlags = [ "-Csrc" "V=1" ]; installPhase = '' install -D -m 0755 src/proot $out/bin/proot-static diff --git a/pkgs/cross-compiling/talloc-static.nix b/pkgs/cross-compiling/talloc-static.nix index 46cb1ce..ea93fa8 100644 --- a/pkgs/cross-compiling/talloc-static.nix +++ b/pkgs/cross-compiling/talloc-static.nix @@ -1,14 +1,14 @@ -# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. -{ callPackage, fetchurl, python3, wafHook }: +{ callPackage, python3, wafHook }: let pkgs = callPackage ./pkgs.nix { }; in -pkgs.cross.talloc.overrideAttrs (old: rec { +pkgs.cross.talloc.overrideAttrs (_: rec { pname = "talloc-static"; - version = "2.1.14"; + version = "2.3.2"; name = "${pname}-${version}"; nativeBuildInputs = [ python3 wafHook ]; @@ -27,7 +27,7 @@ pkgs.cross.talloc.overrideAttrs (old: rec { rm -f $out/lib/libtalloc.so* ''; - prePatch = '' + preConfigure = '' cat < cross-answers.txt Checking uname sysname type: "Linux" Checking uname machine type: "dontcare"