about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2023-09-24 19:37:44 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2023-09-24 19:57:21 +0200
commit70b5588b4e72555f6e788afc0acd3060ab828aef (patch)
tree4752cdeecc9d79852a547171ecc11d785fcae1ac /pkgs/build-support
parente12483116b3b51a185a33a272bf351e357ba9a99 (diff)
downloadnixlib-70b5588b4e72555f6e788afc0acd3060ab828aef.tar
nixlib-70b5588b4e72555f6e788afc0acd3060ab828aef.tar.gz
nixlib-70b5588b4e72555f6e788afc0acd3060ab828aef.tar.bz2
nixlib-70b5588b4e72555f6e788afc0acd3060ab828aef.tar.lz
nixlib-70b5588b4e72555f6e788afc0acd3060ab828aef.tar.xz
nixlib-70b5588b4e72555f6e788afc0acd3060ab828aef.tar.zst
nixlib-70b5588b4e72555f6e788afc0acd3060ab828aef.zip
buildFHSEnvBubblewrap: allow being passed 'pname'
`buildFHSEnvBubblewrap { pname = ...; }` currently results in eval error
because args.name doesn't exist then. Fix it by only using args.name if
it exists.
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/build-fhsenv-bubblewrap/default.nix2
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;