diff options
| author | Artturin <Artturin@artturin.com> | 2022-12-24 17:44:09 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-12-25 14:05:03 +0200 |
| commit | 58fa78077c937e1879a20fc66fe7c6c57e4f75b7 (patch) | |
| tree | 08b5beba6b171cc7c70036aaac300f9bd3b1727e /pkgs/games/steam | |
| parent | 665e15ee407ea3d08c80344fa1da2bad34e78650 (diff) | |
| download | nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.gz nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.bz2 nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.lz nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.xz nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.zst nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.zip | |
treewide: use splicing convenience functions
Diffstat (limited to 'pkgs/games/steam')
| -rw-r--r-- | pkgs/games/steam/default.nix | 14 |
1 files changed, 3 insertions, 11 deletions
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 |