Merge pull request #257122 from bjornfor/fix-buildfhsenv-pname

buildFHSEnvBubblewrap: allow being passed 'pname'
This commit is contained in:
Weijia Wang 2023-10-01 13:55:09 +02:00 committed by GitHub
commit f4098e348c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -31,7 +31,7 @@ assert (pname != null || version != null) -> (name == null && pname != null); #
with builtins;
let
pname = if args.name != null then args.name else args.pname;
pname = if args ? name && args.name != null then args.name else args.pname;
versionStr = lib.optionalString (version != null) ("-" + version);
name = pname + versionStr;