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 proot and talloc

Browse source
This commit is contained in:
Alexander Sosedkin 2020-11-03 05:45:48 +07:00
parent af8d9623e0
commit 239381d4f1
3 changed files with 22 additions and 36 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/r9mavszgwsd2260a252i696fr7j69a3a-proot-termux-unstable-2020-04-25-aarch64-unknown-linux-android"; aarch64 = "/nix/store/ly8ffgwwg7xsgqfcw865vdi0bqaj4vp9-proot-termux-unstable-2020-10-25-aarch64-unknown-linux-android";
i686 = "/nix/store/wkzmc8ly7qgyrfi61pqsz31hxin9wmyz-proot-termux-unstable-2020-04-25-i686-unknown-linux-android"; i686 = "/nix/store/9kgif2f321vrbjd7x0pj7rcyg84zrhgz-proot-termux-unstable-2020-10-25-i686-unknown-linux-android";
}; };
in in
"${crossCompiledPaths.${config.build.arch}}"; "${crossCompiledPaths.${config.build.arch}}";

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

@ -8,13 +8,13 @@ in
pkgs.crossStatic.stdenv.mkDerivation { pkgs.crossStatic.stdenv.mkDerivation {
pname = "proot-termux"; pname = "proot-termux";
version = "unstable-2020-04-25"; version = "unstable-2020-10-25";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "proot"; repo = "proot";
owner = "termux"; owner = "termux";
rev = "b9588b1edff5069118c50f2f9b19397fce39f5c7"; rev = "66b34c6fb38983b09da3400b8bcf86005ebe8dd1";
sha256 = "0izs2vqbn7zaa0fxwr78p1kaa4f3k9rhv4g94zsmw38cqlmidv56"; sha256 = "0isrjcblkdkikw6l6f7a2p326vsy3plbs9ga48r20lpa8rsz4jnf";
}; };
buildInputs = [ tallocStatic ]; buildInputs = [ tallocStatic ];

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

@ -1,46 +1,32 @@
# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE.
{ callPackage, fetchurl, python2, zlib }: { callPackage, fetchurl, python3, wafHook }:
let let
pkgs = callPackage ./pkgs.nix { }; pkgs = callPackage ./pkgs.nix { };
in in
pkgs.cross.stdenv.mkDerivation rec { pkgs.cross.talloc.overrideAttrs (old: rec {
name = "talloc-static-2.1.14"; pname = "talloc-static";
version = "2.1.14";
name = "${pname}-${version}";
src = fetchurl { nativeBuildInputs = [ python3 wafHook ];
url = "mirror://samba/talloc/${name}.tar.gz"; buildInputs = [];
sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
};
depsBuildBuild = [ python2 zlib ]; wafPath = "./buildtools/bin/waf";
wafConfigureFlags = [
"--disable-rpath"
"--disable-python"
"--cross-compile"
"--cross-answers=cross-answers.txt"
];
buildDeps = [ pkgs.cross.zlib ]; postInstall = ''
${pkgs.cross.stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o
configurePhase = ''
substituteInPlace buildtools/bin/waf \
--replace "/usr/bin/env python" "${python2}/bin/python"
./configure --prefix=$out \
--disable-rpath \
--disable-python \
--cross-compile \
--cross-answers=cross-answers.txt
'';
buildPhase = ''
make
'';
installPhase = ''
mkdir -p $out/lib
make install
${pkgs.cross.stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o
rm -f $out/lib/libtalloc.so* rm -f $out/lib/libtalloc.so*
''; '';
fixupPhase = "";
prePatch = '' prePatch = ''
cat <<EOF > cross-answers.txt cat <<EOF > cross-answers.txt
Checking uname sysname type: "Linux" Checking uname sysname type: "Linux"
@ -70,4 +56,4 @@ pkgs.cross.stdenv.mkDerivation rec {
Checking getconf large file support flags work: OK Checking getconf large file support flags work: OK
EOF EOF
''; '';
} })