From 1ed3d42bc10eceed4f9ce8443ef773b1704dc52e Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:36:16 -0700 Subject: [PATCH] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/lazy-pack.nix --- pkgs/games/dwarf-fortress/lazy-pack.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 17037dbdb278..dcaa8102ae98 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -25,9 +25,16 @@ , enableSound ? true }: -with lib; - let + inherit (lib) + getAttr + hasAttr + licenses + maintainers + optional + platforms + ; + dfGame = versionToName dfVersion; dwarf-fortress = if hasAttr dfGame df-games @@ -43,10 +50,10 @@ buildEnv { enableIntro enableTruetype enableFPS enableTextMode enableSound; }) ] - ++ lib.optional enableDwarfTherapist dwarf-therapist - ++ lib.optional enableLegendsBrowser legends-browser; + ++ optional enableDwarfTherapist dwarf-therapist + ++ optional enableLegendsBrowser legends-browser; - meta = with lib; { + meta = { description = "An opinionated wrapper for Dwarf Fortress"; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit;