diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 11:31:39 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 13:36:04 +0700 |
| commit | 2e34288f0d8cf01eea228c7dbc50af9589b885f3 (patch) | |
| tree | 90b3e8c3181614a7a884130ccbee41d34f514cb7 /pkgs/games/openra | |
| parent | 93e5d99592cea45837867ca2a379093aaec3fbe8 (diff) | |
pkgs/games: stdenv.lib -> lib
Diffstat (limited to 'pkgs/games/openra')
| -rw-r--r-- | pkgs/games/openra/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/openra/engine.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/openra/mod.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 51f9417717770..4f90cecb16bbb 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -1,13 +1,13 @@ /* The reusable code, and package attributes, between OpenRA engine packages (engine.nix) and out-of-tree mod packages (mod.nix). */ -{ stdenv, makeSetupHook, curl, unzip, dos2unix, pkgconfig, makeWrapper +{ lib, stdenv, makeSetupHook, curl, unzip, dos2unix, pkgconfig, makeWrapper , lua, mono, dotnetPackages, python , libGL, freetype, openal, SDL2 , zenity }: -with stdenv.lib; +with lib; let path = makeBinPath ([ mono python ] ++ optional (zenity != null) zenity); diff --git a/pkgs/games/openra/engine.nix b/pkgs/games/openra/engine.nix index 7d2d007d07585..365dc3d26793e 100644 --- a/pkgs/games/openra/engine.nix +++ b/pkgs/games/openra/engine.nix @@ -7,14 +7,14 @@ This package could be seen as providing a set of in-tree mods, while the `mod.nix` pacakges provide a single out-of-tree mod. */ -{ stdenv +{ lib, stdenv , packageAttrs , patchEngine , wrapLaunchGame , engine }: -with stdenv.lib; +with lib; stdenv.mkDerivation (recursiveUpdate packageAttrs rec { name = "${pname}-${version}"; diff --git a/pkgs/games/openra/mod.nix b/pkgs/games/openra/mod.nix index 8df5922a44180..4d0a18e6334ea 100644 --- a/pkgs/games/openra/mod.nix +++ b/pkgs/games/openra/mod.nix @@ -6,7 +6,7 @@ The engine is relatively small and quick to build, so this is not much of a problem. Building a mod will result in a wrapper script that starts the mod inside the specified engine. */ -{ stdenv +{ lib, stdenv , packageAttrs , patchEngine , wrapLaunchGame @@ -14,7 +14,7 @@ , engine }: -with stdenv.lib; +with lib; let engineSourceName = engine.src.name or "engine"; |