nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

pkgs: update talloc and proot

Browse source
This commit is contained in:
Alexander Sosedkin 2021-06-19 05:02:46 +02:00
parent 9fcce0d7df
commit 6d7edfc20b
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/environment/login/default.nix
View file

@ -85,8 +85,8 @@ in
prootStatic = prootStatic =
let let
crossCompiledPaths = { crossCompiledPaths = {
aarch64 = "/nix/store/0xfjhi3529lzym7z7025xs7kignmgy0r-proot-termux-aarch64-unknown-linux-android-unstable-2020-10-25"; aarch64 = "/nix/store/7j051wmlb19l8f89v78kmv52bbsz5b6l-proot-termux-aarch64-unknown-linux-android-unstable-2021-05-19";
i686 = "/nix/store/jl91v6ya3ablh8v41k63vcwsim5b4v1s-proot-termux-i686-unknown-linux-android-unstable-2020-10-25"; i686 = "/nix/store/nbgaw5xm6q5iv43p374h0p0qfdm1cmcz-proot-termux-i686-unknown-linux-android-unstable-2021-05-19";
}; };
in in
"${crossCompiledPaths.${config.build.arch}}"; "${crossCompiledPaths.${config.build.arch}}";

15
pkgs/cross-compiling/proot-termux.nix
View file

@ -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 }: { callPackage, fetchFromGitHub, tallocStatic }:
@ -8,20 +8,25 @@ in
pkgs.crossStatic.stdenv.mkDerivation { pkgs.crossStatic.stdenv.mkDerivation {
pname = "proot-termux"; pname = "proot-termux";
version = "unstable-2020-10-25"; version = "unstable-2021-05-19";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "proot"; repo = "proot";
owner = "termux"; owner = "termux";
rev = "66b34c6fb38983b09da3400b8bcf86005ebe8dd1"; rev = "3b7369b8eb8b2a879aade2b403b3ac0eb848b9ed"; # the one with make fix
sha256 = "0isrjcblkdkikw6l6f7a2p326vsy3plbs9ga48r20lpa8rsz4jnf"; sha256 = "1wrrar08axfwrma7yp2zlf61cz4crypr3m1jnhkqng7p1pry1cay";
# 1 step behind 6f12fbee "Implement shmat", use if ashmem.h is missing
#rev = "ffd811ee726c62094477ed335de89fc107cadf17";
#sha256 = "1zjblclsybvsrjmq2i0z6prhka268f0609w08dh9vdrbrng117f8";
}; };
buildInputs = [ tallocStatic ]; buildInputs = [ tallocStatic ];
patches = [ ./proot-detranslate-empty.patch ]; patches = [ ./proot-detranslate-empty.patch ];
makeFlags = [ "-Csrc CFLAGS=-D__ANDROID__" ]; makeFlags = [ "-Csrc" "V=1" ];
installPhase = '' installPhase = ''
install -D -m 0755 src/proot $out/bin/proot-static install -D -m 0755 src/proot $out/bin/proot-static

10
pkgs/cross-compiling/talloc-static.nix
View file

@ -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 let
pkgs = callPackage ./pkgs.nix { }; pkgs = callPackage ./pkgs.nix { };
in in
pkgs.cross.talloc.overrideAttrs (old: rec { pkgs.cross.talloc.overrideAttrs (_: rec {
pname = "talloc-static"; pname = "talloc-static";
version = "2.1.14"; version = "2.3.2";
name = "${pname}-${version}"; name = "${pname}-${version}";
nativeBuildInputs = [ python3 wafHook ]; nativeBuildInputs = [ python3 wafHook ];
@ -27,7 +27,7 @@ pkgs.cross.talloc.overrideAttrs (old: rec {
rm -f $out/lib/libtalloc.so* rm -f $out/lib/libtalloc.so*
''; '';
prePatch = '' preConfigure = ''
cat <<EOF > cross-answers.txt cat <<EOF > cross-answers.txt
Checking uname sysname type: "Linux" Checking uname sysname type: "Linux"
Checking uname machine type: "dontcare" Checking uname machine type: "dontcare"