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

Merge 101d81c960 into 5d88ff2519

Browse source
This commit is contained in:
Izel Nakri | izelnakri.eth 2025-02-16 23:30:12 +00:00 • committed by GitHub
commit 5aa02c8294
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 22 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

38
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709445365, "lastModified": 1732482255,
"narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -31,11 +31,11 @@
"nmt": "nmt" "nmt": "nmt"
}, },
"locked": { "locked": {
"lastModified": 1705252799, "lastModified": 1729445390,
"narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", "narHash": "sha256-TxJ7RZLlBkKWZos1ai3eWIH0fBq1G6SVE+q3dW+0qRU=",
"owner": "Gerschtli", "owner": "Gerschtli",
"repo": "nix-formatter-pack", "repo": "nix-formatter-pack",
"rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", "rev": "9f4bcf647cad2edafda7e1143071e0daf37cbc41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -46,11 +46,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1708172716, "lastModified": 1732665169,
"narHash": "sha256-3M94oln0b61m3dUmLyECCA9hYAHXZEszM4saE3CmQO4=", "narHash": "sha256-BWzlDJpfcE7DgxtAkeXHnU69Iz6cU64yCgE6b+hqds8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5d874ac46894c896119bce68e758e9e80bdb28f1", "rev": "69661586d1c9d85e859887d95285f6fc92521657",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,22 +59,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-docs": {
"locked": {
"lastModified": 1705957679,
"narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-for-bootstrap": { "nixpkgs-for-bootstrap": {
"locked": { "locked": {
"lastModified": 1720244366, "lastModified": 1720244366,
@ -133,7 +117,9 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-formatter-pack": "nix-formatter-pack", "nix-formatter-pack": "nix-formatter-pack",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-docs": "nixpkgs-docs", "nixpkgs-docs": [
"nixpkgs"
],
"nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
"nmd": "nmd" "nmd": "nmd"
} }

2
flake.nix
View file

@ -20,7 +20,7 @@
inputs.nmd.follows = "nmd"; inputs.nmd.follows = "nmd";
}; };
nixpkgs-docs.url = "github:NixOS/nixpkgs/release-23.05"; nixpkgs-docs.follows = "nixpkgs";
nmd = { nmd = {
url = "sourcehut:~rycee/nmd"; url = "sourcehut:~rycee/nmd";

2
modules/build/config.nix
View file

@ -43,7 +43,7 @@ with lib;
config = { config = {
build.installationDir = "/data/data/com.termux.nix/files/usr"; build.installationDir = "/data/data/com.termux/files/nix";
}; };

5
modules/environment/login/login.nix
View file

@ -46,6 +46,11 @@ writeScript "login" ''
BIND_PROC_UPTIME="" BIND_PROC_UPTIME=""
fi fi
# See https://github.com/CypherpunkArmory/UserLAnd/issues/1333
unset LD_LIBRARY_PATH
unset LD_PRELOAD
exec ${installationDir}/bin/proot-static \ exec ${installationDir}/bin/proot-static \
-b ${installationDir}/nix:/nix \ -b ${installationDir}/nix:/nix \
-b ${installationDir}/bin:/bin! \ -b ${installationDir}/bin:/bin! \

2
modules/user.nix
View file

@ -91,7 +91,7 @@ in
user = { user = {
group = "nix-on-droid"; group = "nix-on-droid";
home = "/data/data/com.termux.nix/files/home"; home = "/data/data/com.termux/files/home";
userName = "nix-on-droid"; userName = "nix-on-droid";
}; };

4
pkgs/bootstrap-zip.nix
View file

@ -1,6 +1,6 @@
# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
{ lib, runCommand, zip, bootstrap, targetSystem }: { lib, runCommand, gnutar, bootstrap, targetSystem }:
let let
arch = lib.strings.removeSuffix "-linux" targetSystem; arch = lib.strings.removeSuffix "-linux" targetSystem;
@ -8,5 +8,5 @@ in
runCommand "bootstrap-zip" { } '' runCommand "bootstrap-zip" { } ''
mkdir $out mkdir $out
cd ${bootstrap} cd ${bootstrap}
${zip}/bin/zip -q -9 -r $out/bootstrap-${arch} ./* ./.l2s ${gnutar}/bin/tar czf $out/bootstrap-${arch}.tar.gz ./* ./.l2s
'' ''

9
pkgs/bootstrap.nix
View file

@ -22,13 +22,4 @@ runCommand "bootstrap" { } ''
cp --dereference --recursive $out/etc/static $out/etc/.static.tmp cp --dereference --recursive $out/etc/static $out/etc/.static.tmp
rm $out/etc/static rm $out/etc/static
mv $out/etc/.static.tmp $out/etc/static mv $out/etc/.static.tmp $out/etc/static
find $out -executable -type f | sed s@^$out/@@ > $out/EXECUTABLES.txt
find $out -type l | while read -r LINK; do
LNK=''${LINK#$out/}
TGT=$(readlink "$LINK")
echo "$TGT←$LNK" >> $out/SYMLINKS.txt
rm "$LINK"
done
'' ''