From 7b5a103e4a496fbcc42a91f93f4cfb29bf96e044 Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Sat, 7 Nov 2020 16:12:59 +0100 Subject: [PATCH] build/config: add config.build.extraProotOptions --- modules/build/config.nix | 6 ++++++ modules/environment/login/login.nix | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/build/config.nix b/modules/build/config.nix index f91c795..092c221 100644 --- a/modules/build/config.nix +++ b/modules/build/config.nix @@ -35,6 +35,12 @@ with lib; readOnly = true; description = "Path to installation directory."; }; + + extraProotOptions = mkOption { + type = types.listOf types.string; + default = []; + description = "Extra options passed to proot, e.g., extra bind mounts."; + }; }; }; diff --git a/modules/environment/login/login.nix b/modules/environment/login/login.nix index 9d7580c..e22cc6d 100644 --- a/modules/environment/login/login.nix +++ b/modules/environment/login/login.nix @@ -3,7 +3,7 @@ { config, writeScript }: let - inherit (config.build) installationDir; + inherit (config.build) installationDir extraProotOptions; in writeScript "login" '' @@ -36,5 +36,6 @@ writeScript "login" '' -b ${installationDir}/usr:/usr \ -b /:/android \ --link2symlink \ + ${builtins.concatStringsSep " " extraProotOptions} \ ${installationDir}/bin/sh ${installationDir}/usr/lib/login-inner "$@" ''