From f88ac5c0b5292ad2398927fd0ec97489399493e6 Mon Sep 17 00:00:00 2001 From: sterni Date: Tue, 20 Apr 2021 10:18:28 +0200 Subject: feat(nix/utils): add storePathName, a more generic baseNameOf This is a wrapper around baseNameOf which also can deal with derivations. Added to //nix/utils since I've found myself introducing an ad-hoc implementation of this for both //web/bubblegum and //nix/buildC. Change-Id: I2fcd97a150d6eda21ab323fa0d881ff7442a892e Reviewed-on: https://cl.tvl.fyi/c/depot/+/3049 Tested-by: BuildkiteCI Reviewed-by: tazjin --- web/bubblegum/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'web/bubblegum') diff --git a/web/bubblegum/default.nix b/web/bubblegum/default.nix index d9b106ddde..ed4e48839b 100644 --- a/web/bubblegum/default.nix +++ b/web/bubblegum/default.nix @@ -5,6 +5,7 @@ let inherit (depot.nix) runExecline getBins + utils ; statusCodes = { @@ -179,16 +180,13 @@ let # the input path or name of the input derivation. # Must be given if the input is a string. , name ? null - }: + , ... + }@args: input: let drvName = - if name != null - then name - else if builtins.isPath input - then baseNameOf input - else if lib.isDerivation input - then input.name - else builtins.throw "Need name"; + if builtins.isString input || args ? name + then args.name + else utils.storePathName input; script = if builtins.isPath input || lib.isDerivation input then input -- cgit 1.4.1