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 2023-06-18 22:43:01 +02:00
parent 468bf944df
commit 2301e01d48
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ in
environment.files = { environment.files = {
inherit login loginInner; inherit login loginInner;
prootStatic = "/nix/store/ri1shq027hlwsjk94vv82fdvdv37n69x-proot-termux-static-aarch64-unknown-linux-android-unstable-2022-05-03"; prootStatic = "/nix/store/yrrs22jsl1y8niwzs2vvk0vblicr3903-proot-termux-static-aarch64-unknown-linux-android-unstable-2023-05-13";
}; };
}; };

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

@ -1,4 +1,4 @@
# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
{ callPackage { callPackage
, nixpkgs , nixpkgs
@ -14,11 +14,11 @@ in
pkgsCross.stdenv.mkDerivation rec { pkgsCross.stdenv.mkDerivation rec {
pname = "talloc"; pname = "talloc";
version = "2.3.4"; version = "2.4.0";
src = fetchurl { src = fetchurl {
url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
sha256 = "sha256-F5+eviZeZ+SrLCbK0rfeS2p3xsIS+WaQM4KGnwa+ZQU="; sha256 = "sha256-bfNoYsQkZu+I82BERROHDvRpNPkBbIQ4PMQAin0MRro=";
}; };
nativeBuildInputs = [ pkg-config python3 wafHook ]; nativeBuildInputs = [ pkg-config python3 wafHook ];

9
pkgs/proot-termux/default.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
@ -9,13 +9,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "proot-termux"; pname = "proot-termux";
version = "unstable-2022-05-03"; version = "unstable-2023-05-13";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "proot"; repo = "proot";
owner = "termux"; owner = "termux";
rev = "5c462a6ecfddd629b1439f38fbb61216d6fcb359"; rev = "2d7c70eec7e2688e465c7bfba60c927fad0abfb1";
sha256 = "sha256-XS4js80NsAN2C4jMuISSqMm/DwYpH/stbABaxzoqZcE="; sha256 = "sha256-FgK5Rvl95yfH+aqTsJZ8HzSsCYIE3iLiQMFIlw0Z6oc=";
}; };
# ashmem.h is rather small, our needs are even smaller, so just define these: # ashmem.h is rather small, our needs are even smaller, so just define these:
@ -27,6 +27,7 @@ stdenv.mkDerivation {
#define ASHMEM_NAME_LEN 256 #define ASHMEM_NAME_LEN 256
#define ASHMEM_SET_NAME _IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN]) #define ASHMEM_SET_NAME _IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN])
#define ASHMEM_SET_SIZE _IOW(__ASHMEMIOC, 3, size_t) #define ASHMEM_SET_SIZE _IOW(__ASHMEMIOC, 3, size_t)
#define ASHMEM_GET_SIZE _IO(__ASHMEMIOC, 4)
EOF EOF
''; '';