diff options
Diffstat (limited to 'pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix')
| -rw-r--r-- | pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 2ab7847926e29..1e34ad1e5e448 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -8,14 +8,14 @@ , pkgsi686Linux }: -{ name ? null -, profile ? "" +{ profile ? "" , targetPkgs ? pkgs: [] , multiPkgs ? pkgs: [] , multiArch ? false # Whether to include 32bit packages , extraBuildCommands ? "" , extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] +, ... # for name, or pname+version } @ args: # HOWTO: @@ -36,6 +36,10 @@ let inherit (stdenv) is64bit; + name = if (args ? pname && args ? version) + then "${args.pname}-${args.version}" + else args.name; + # "use of glibc_multi is only supported on x86_64-linux" isMultiBuild = multiArch && stdenv.system == "x86_64-linux"; isTargetBuild = !isMultiBuild; |