pkgs/games: stdenv.lib -> lib

This commit is contained in:
Ben Siraphob
2021-01-15 13:36:04 +07:00
parent 93e5d99592
commit 2e34288f0d
159 changed files with 457 additions and 465 deletions
+6 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem
, alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL
, libSM, libICE, libXext, factorio-utils
, releaseType
@@ -13,7 +13,7 @@ assert releaseType == "alpha"
let
inherit (stdenv.lib) importJSON;
inherit (lib) importJSON;
helpMsg = ''
@@ -83,7 +83,7 @@ let
if !needsAuth then
fetchurl { inherit name url sha256; }
else
(stdenv.lib.overrideDerivation
(lib.overrideDerivation
(fetchurl {
inherit name url sha256;
curlOpts = [
@@ -168,8 +168,8 @@ let
version 1.0 in mid 2020.
'';
homepage = "https://www.factorio.com/";
license = stdenv.lib.licenses.unfree;
maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen priegger lukegb ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ Baughn elitak erictapen priegger lukegb ];
platforms = [ "x86_64-linux" ];
};
};
@@ -180,7 +180,7 @@ let
buildInputs = [ makeWrapper libpulseaudio ];
libPath = stdenv.lib.makeLibraryPath [
libPath = lib.makeLibraryPath [
alsaLib
libpulseaudio
libX11
+2 -2
View File
@@ -2,12 +2,12 @@
# mods. It will eventually be replaced by a nixos-channel that will provide
# derivations for most or all of the mods tracked through the official mod
# manager site.
{ stdenv, fetchurl
{ lib, stdenv, fetchurl
, factorio-utils
, allRecommendedMods ? true
, allOptionalMods ? false
}:
with stdenv.lib;
with lib;
let
modDrv = factorio-utils.modDrv { inherit allRecommendedMods allOptionalMods; };
in
+2 -2
View File
@@ -1,7 +1,7 @@
# 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.
{ stdenv }:
with stdenv.lib;
{ lib, stdenv }:
with lib;
{
mkModDirDrv = mods: # a list of mod derivations
let