lib/customisation.nix: Refactor: convert if to or

Should be faster.
NixOS · Feb 20, 2023 · 4002775 · 4002775
1 parent 3290d04
commit 4002775
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/lib/customisation.nix b/lib/customisation.nix
@@ -218,19 +218,15 @@ rec {
  inherit outputName;
  outputSpecified = true;
  drvPath = assert condition;
- if isAttrs drv.${outputName}
- then
- drv.${outputName}.drvPath
- else
- assert isString drv.${outputName};
- drv.${outputName};
+ drv.${outputName}.drvPath or (
+ assert isString drv.drvPath;
+ drv.drvPath
+ );
  outPath = assert condition;
- if isAttrs drv.${outputName}
- then
- drv.${outputName}.outPath
- else
+ drv.${outputName}.outPath or (
  assert isString drv.${outputName};
- drv.${outputName};
+ drv.${outputName}
+ );
  };
  };