Unverified Commit f4098e34 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

buildFHSEnvBubblewrap: allow being passed 'pname'
parents c3be222a 70b5588b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;