From 58fa78077c937e1879a20fc66fe7c6c57e4f75b7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 24 Dec 2022 17:44:09 +0200 Subject: treewide: use splicing convenience functions --- pkgs/games/steam/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'pkgs/games/steam') diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 395980e8ee6..9dfb239620e 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,5 +1,4 @@ -{ lib, newScope, splicePackages, steamPackagesAttr ? "steamPackages" -, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget +{ makeScopeWithSplicing, generateSplicesForMkScope , stdenv, buildFHSUserEnv, pkgsi686Linux }: @@ -18,19 +17,12 @@ let glxinfo-i686 = pkgsi686Linux.glxinfo; steam-runtime-wrapped-i686 = if self.steamArch == "amd64" - then pkgsi686Linux.${steamPackagesAttr}.steam-runtime-wrapped + then pkgsi686Linux.steamPackages.steam-runtime-wrapped else null; inherit buildFHSUserEnv; }; steamcmd = callPackage ./steamcmd.nix { }; }; - otherSplices = { - selfBuildBuild = pkgsBuildBuild.${steamPackagesAttr}; - selfBuildHost = pkgsBuildHost.${steamPackagesAttr}; - selfBuildTarget = pkgsBuildTarget.${steamPackagesAttr}; - selfHostHost = pkgsHostHost.${steamPackagesAttr}; - selfTargetTarget = pkgsTargetTarget.${steamPackagesAttr} or {}; # might be missing; - }; keep = self: { }; extra = spliced0: { }; -in lib.makeScopeWithSplicing splicePackages newScope otherSplices keep extra steamPackagesFun +in makeScopeWithSplicing (generateSplicesForMkScope "steamPackages") keep extra steamPackagesFun -- cgit 1.4.1