From 70b5588b4e72555f6e788afc0acd3060ab828aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 24 Sep 2023 19:37:44 +0200 Subject: [PATCH] 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. --- pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;