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

deduplicate proot for device and proot for fakedroid

Browse source
This commit is contained in:
Alexander Sosedkin 2021-12-12 16:23:37 +01:00
parent a6b8efbae3
commit 856d931972
5 changed files with 45 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

37
pkgs/cross-compiling/proot-detranslate-empty.patch
View file

@ -1,37 +0,0 @@
From 7d7479c490de083729253f120a5e9a9c5bd47d0c Mon Sep 17 00:00:00 2001
From: Florian Wernli <florian.wernli@gmail.com>
Date: Sat, 14 Mar 2020 17:52:19 +0100
Subject: [PATCH] detranslate: check for empty path or t_referrer.
cmpare_paths2: either the asserts or the followed if statement is wrong
---
src/path/path.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/path/path.c b/src/path/path.c
index d5c9ec6..7a5e398 100644
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -413,11 +413,11 @@ int detranslate_path(Tracee *tracee, char path[PATH_MAX], const char t_referrer[
/* Don't try to detranslate relative paths (typically the
* target of a relative symbolic link). */
- if (path[0] != '/')
+ if (path[0] != '/' || path[0] == 0)
return 0;
/* Is it a symlink? */
- if (t_referrer != NULL) {
+ if (t_referrer != NULL && t_referrer[0] != 0) {
Comparison comparison;
sanity_check = false;
@@ -543,8 +543,6 @@ Comparison compare_paths2(const char *path1, size_t length1, const char *path2,
assert(length(path1) == length1);
assert(length(path2) == length2);
#endif
- assert(length1 > 0);
- assert(length2 > 0);
if (!length1 || !length2) {
return PATHS_ARE_NOT_COMPARABLE;

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

@ -1,36 +1,15 @@
# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
{ callPackage, fetchFromGitHub, tallocStatic }:
{ callPackage, tallocStatic }:
let
pkgsCross = callPackage ./cross-pkgs.nix { };
stdenv = pkgsCross.pkgsStatic.stdenvAdapters.makeStaticBinaries pkgsCross.stdenv;
in
stdenv.mkDerivation {
pname = "proot-termux";
version = "unstable-2021-11-21";
src = fetchFromGitHub {
repo = "proot";
owner = "termux";
rev = "7d6bdd9f6cf31144e11ce65648dab2a1e495a7de";
sha256 = "sha256-sbueMoqhOw0eChgp6KOZbhwRnSmDZhHq+jm06mGqxC4=";
# 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" "V=1" ];
installPhase = ''
install -D -m 0755 src/proot $out/bin/proot-static
'';
}
callPackage ../proot-termux {
pkgs = pkgsCross;
talloc = tallocStatic;
inherit stdenv;
}