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

pkgs/nix-directory: update nix to 2.20.4

Browse source 
Co-authored-by: Tobias Happ <tobias.happ@gmx.de>
This commit is contained in:
Alexander Sosedkin 2024-02-17 13:24:08 +01:00
parent be783dd251
commit 970a735f56
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkgs/bootstrap.nix
View file

@ -1,9 +1,10 @@
# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
{ runCommand, nixDirectory, prootTermux, bash, pkgs, config, initialPackageInfo }:
runCommand "bootstrap" { } ''
mkdir --parents $out/{.l2s,bin,dev/shm,etc,nix,root,tmp,usr/{bin,lib}}
mkdir --parents $out/{.l2s,bin,dev/shm,etc,root,tmp,usr/{bin,lib}}
mkdir --parents $out/nix/var/nix/{profiles,gcroots}/per-user/nix-on-droid
cp --recursive ${nixDirectory}/store $out/nix/store
cp --recursive ${nixDirectory}/var $out/nix/var

6
pkgs/nix-directory.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
{ config, lib, stdenv, closureInfo, prootTermux, proot, pkgsStatic }:
@ -24,8 +24,8 @@ stdenv.mkDerivation {
name = "nix-directory";
src = builtins.fetchurl {
url = "https://nixos.org/releases/nix/nix-2.16.1/nix-2.16.1-${config.build.arch}-linux.tar.xz";
sha256 = "1v7k1cajyxgaq3adrzykaf0a32n5pyrd7njy0rns1fma85y8n944";
url = "https://nixos.org/releases/nix/nix-2.20.4/nix-2.20.4-${config.build.arch}-linux.tar.xz";
sha256 = "sha256:10nk5dn5mhlql3842jn8ikvywcidgfjycfqcv7cg9i97lgi12x0q";
};
PROOT_NO_SECCOMP = 1; # see https://github.com/proot-me/PRoot/issues/106