From c8d479d4bbbf48c28b2e28a227616f029d4adf83 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Thu, 19 Dec 2024 09:05:40 +0300 Subject: [PATCH] Package: Fix steam run configuration location. --- package/default.nix | 9 +-------- package/steamrun/default.nix | 18 +++++++++--------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/package/default.nix b/package/default.nix index 629d7dff..6a05a5f2 100644 --- a/package/default.nix +++ b/package/default.nix @@ -137,15 +137,8 @@ steam # Gaming platform. vkd3d # Directx to Vulkan. wine64 # Run Windows software on Linux. - (steam.override { - extraLibraries = - _: with pkgs; [ - (callPackage ./openssl100 { }) - curlWithGnuTls - ]; - }).run - # (import ./steamrun args).pkg # Steam env to run native games. + (import ./steamrun args).pkg # Steam env to run native games. ]; creative = with pkgs; [ diff --git a/package/steamrun/default.nix b/package/steamrun/default.nix index 31531ba5..446e420a 100644 --- a/package/steamrun/default.nix +++ b/package/steamrun/default.nix @@ -1,11 +1,11 @@ +{ __findFile, pkgs, ... }: { - __findFile, - inputs, - pkgs, - ... -}: -{ - pkg = pkgs.callPackage "${inputs.nixpkgs}/pkgs/by-name/st/steam/package.nix" { - extraLibraries = pkgs: [ (pkgs.callPackage { }) ]; - }; + pkg = + with pkgs; + (steam.override { + extraLibraries = _: [ + (callPackage { }) + curlWithGnuTls + ]; + }).run; }