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

merge multiple extra-experimental-features args

Browse source
This commit is contained in:
Tobias Happ 2022-10-27 20:25:33 +02:00
parent b8ac792d3c
commit 3629a12231
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/environment/login/login-inner.nix
View file

@ -5,7 +5,7 @@
let let
inherit (initialPackageInfo) cacert nix; inherit (initialPackageInfo) cacert nix;
nixCmd = "${nix}/bin/nix --extra-experimental-features flakes --extra-experimental-features nix-command"; nixCmd = "${nix}/bin/nix --extra-experimental-features 'flakes nix-command'";
in in
writeText "login-inner" '' writeText "login-inner" ''

4
nix-on-droid/nix-on-droid.sh
View file

@ -1,6 +1,6 @@
#!@bash@/bin/bash #!@bash@/bin/bash
# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
PATH=@coreutils@/bin:@nix@/bin:${PATH:+:}$PATH PATH=@coreutils@/bin:@nix@/bin:${PATH:+:}$PATH
@ -136,7 +136,7 @@ while [[ $# -gt 0 ]]; do
shift shift
;; ;;
-F|--flake) -F|--flake)
PASSTHROUGH_OPTS+=(--extra-experimental-features flakes --extra-experimental-features nix-command) PASSTHROUGH_OPTS+=(--extra-experimental-features "flakes nix-command")
# add "nixOnDroidConfigurations." as prefix in attribute name, e.g. # add "nixOnDroidConfigurations." as prefix in attribute name, e.g.
# /path/to/flake#device -> /path/to/flake#nixOnDroidConfigurations.device # /path/to/flake#device -> /path/to/flake#nixOnDroidConfigurations.device
FLAKE_CONFIG_URI="${1%#*}#nixOnDroidConfigurations.${1#*#}" FLAKE_CONFIG_URI="${1%#*}#nixOnDroidConfigurations.${1#*#}"