diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-01 13:55:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-01 13:55:09 +0200 |
| commit | f4098e348cad53d91d0e5231d720ff5ddac496b5 (patch) | |
| tree | 39edca1ac1d0fe7fa63ea039d7fd53c8084ead84 /pkgs/build-support | |
| parent | c3be222ad897e507856c7248450e9511d0787ce0 (diff) | |
| parent | 70b5588b4e72555f6e788afc0acd3060ab828aef (diff) | |
| download | nixlib-f4098e348cad53d91d0e5231d720ff5ddac496b5.tar nixlib-f4098e348cad53d91d0e5231d720ff5ddac496b5.tar.gz nixlib-f4098e348cad53d91d0e5231d720ff5ddac496b5.tar.bz2 nixlib-f4098e348cad53d91d0e5231d720ff5ddac496b5.tar.lz nixlib-f4098e348cad53d91d0e5231d720ff5ddac496b5.tar.xz nixlib-f4098e348cad53d91d0e5231d720ff5ddac496b5.tar.zst nixlib-f4098e348cad53d91d0e5231d720ff5ddac496b5.zip | |
Merge pull request #257122 from bjornfor/fix-buildfhsenv-pname
buildFHSEnvBubblewrap: allow being passed 'pname'
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 5e8894d7cb33..f4942290af4b 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -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; |