diff options
| author | Atemu <atemu.main@gmail.com> | 2023-03-27 08:46:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 08:46:24 +0200 |
| commit | bdf0dd28b9ad2522b53a08dcfd72fda31a87b14a (patch) | |
| tree | 6588222cc05a8880bdf8e769c9003d4d2258c0fd /pkgs/build-support/build-fhs-userenv-bubblewrap | |
| parent | 8182121624b8b9203fa5f09074ceae3fa19367a1 (diff) | |
| parent | 81d23b8d3a022b5a74c9944a96e916c7f156382d (diff) | |
Merge pull request #219091 from cdepillabout/buildfhsuserenv-version
buildFHSUserEnv: add version arg
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv-bubblewrap')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 76e68573faa82..74a22566d51c4 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -2,6 +2,7 @@ args @ { name +, version ? null , runScript ? "bash" , extraInstallCommands ? "" , meta ? {} @@ -24,6 +25,7 @@ let env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent" "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" + "version" ]); etcBindEntries = let @@ -203,7 +205,11 @@ let bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; }); -in runCommandLocal name { + versionStr = lib.optionalString (version != null) ("-" + version); + + nameAndVersion = name + versionStr; + +in runCommandLocal nameAndVersion { inherit meta; passthru = passthru // { |