From 9be6e2203771aaa21f2eb373994aef7a0e130fed Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:40:44 -0700 Subject: [PATCH] Avoid top-level `with ...;` in pkgs/games/factorio/utils.nix --- pkgs/games/factorio/utils.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/games/factorio/utils.nix b/pkgs/games/factorio/utils.nix index d2b52ae48366..b68cc921996e 100644 --- a/pkgs/games/factorio/utils.nix +++ b/pkgs/games/factorio/utils.nix @@ -1,7 +1,18 @@ # This file provides a top-level function that will be used by both nixpkgs and nixos # to generate mod directories for use at runtime by factorio. { lib, stdenv }: -with lib; +let + inherit (lib) + flatten + head + optionals + optionalString + removeSuffix + replaceStrings + splitString + unique + ; +in { mkModDirDrv = mods: modsDatFile: # a list of mod derivations let @@ -18,7 +29,7 @@ with lib; # NB: there will only ever be a single zip file in each mod derivation's output dir ln -s $modDrv/*.zip $out done - '' + (lib.optionalString (modsDatFile != null) '' + '' + (optionalString (modsDatFile != null) '' cp ${modsDatFile} $out/mod-settings.dat ''); };