diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2020-08-17 08:49:34 +0100 |
---|---|---|
committer | Atemu <atemu.main@gmail.com> | 2020-08-17 10:05:25 +0200 |
commit | b1d86d0e51c9eafbb629f3cd782cfe954e687421 (patch) | |
tree | 0729e31167d9a6049f5fc9ce909f213853630dab /pkgs/build-support | |
parent | 3f5157f12267e7502d0f5e6c913f18b007993377 (diff) |
build-fhs-user-env-bubblewrap: consistent camelCase
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 8 | ||||
-rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 267a0865f99f6..c7cfd27d3faa0 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -58,7 +58,7 @@ let exec ${run} "$@" ''; - bwrap_cmd = { init_args ? "" }: '' + bwrapCmd = { initArgs ? "" }: '' blacklist="/nix /dev /proc /etc" ro_mounts="" for i in ${env}/*; do @@ -98,17 +98,17 @@ let ${etcBindFlags} \ $ro_mounts \ $auto_mounts \ - ${init runScript}/bin/${name}-init ${init_args} + ${init runScript}/bin/${name}-init ${initArgs} ''; - bin = writeShellScriptBin name (bwrap_cmd { init_args = ''"$@"''; }); + bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; }); in runCommandLocal name { inherit meta; passthru = passthru // { env = runCommandLocal "${name}-shell-env" { - shellHook = bwrap_cmd {}; + shellHook = bwrapCmd {}; } '' echo >&2 "" echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 08f58471bf02d..8b2d46c4ae98e 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -99,14 +99,14 @@ let }; # setup library paths only for the targeted architecture - setupLibDirs_target = '' + setupLibDirsTarget = '' # link content of targetPaths cp -rsHf ${staticUsrProfileTarget}/lib lib ln -s lib lib${if is64Bit then "64" else "32"} ''; # setup /lib, /lib32 and /lib64 - setupLibDirs_multi = '' + setupLibDirsMulti = '' mkdir -m0755 lib32 mkdir -m0755 lib64 ln -s lib64 lib @@ -124,8 +124,8 @@ let ln -Ls ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ ''; - setupLibDirs = if isTargetBuild then setupLibDirs_target - else setupLibDirs_multi; + setupLibDirs = if isTargetBuild then setupLibDirsTarget + else setupLibDirsMulti; # the target profile is the actual profile that will be used for the chroot setupTargetProfile = '' |