From 44f2f9efcdc66b468ac785bcb490df4d37cb3f33 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Thu, 22 Jun 2023 17:25:43 +0200 Subject: [PATCH] openraPackages_2019: don't use pkgs.lib --- pkgs/games/openra_2019/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix index 9696e4fe265..0bcf71cd87f 100644 --- a/pkgs/games/openra_2019/default.nix +++ b/pkgs/games/openra_2019/default.nix @@ -6,11 +6,9 @@ Additional engines or mods can be added with `openraPackages.buildOpenRAEngine` (function around `engine.nix`) and `openraPackages.buildOpenRAMod` (function around `mod.nix`), respectively. */ -pkgs: +{ pkgs, lib }: let - lib = pkgs.lib; - /* Building an engine or out-of-tree mod is very similar, but different enough not to be able to build them with the same package definition, so instaed we define what is common between them in a separate file. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d874c8c9a7..4ba01395a9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37138,7 +37138,10 @@ with pkgs; otto-matic = callPackage ../games/otto-matic { }; - openraPackages_2019 = import ../games/openra_2019 pkgs.__splicedPackages; + openraPackages_2019 = import ../games/openra_2019 { + inherit lib; + pkgs = pkgs.__splicedPackages; + }; openra_2019 = openraPackages_2019.engines.release;