summary refs log tree commit diff
path: root/pkgs/games/steam
diff options
context:
space:
mode:
authorvolth <volth@webmaster.ms>2018-03-13 10:16:03 +0000
committerzimbatm <zimbatm@zimbatm.com>2018-03-13 10:16:03 +0000
commit7ec04712423d47148f98fe3c935c60d181af99c4 (patch)
treea15663ddc34ee04316c32f3cf59b2fca8d9cd6b6 /pkgs/games/steam
parentebb562d29a6b397d1fb30d094cefe2030559711c (diff)
downloadnixpkgs-7ec04712423d47148f98fe3c935c60d181af99c4.tar
nixpkgs-7ec04712423d47148f98fe3c935c60d181af99c4.tar.gz
nixpkgs-7ec04712423d47148f98fe3c935c60d181af99c4.tar.bz2
nixpkgs-7ec04712423d47148f98fe3c935c60d181af99c4.tar.lz
nixpkgs-7ec04712423d47148f98fe3c935c60d181af99c4.tar.xz
nixpkgs-7ec04712423d47148f98fe3c935c60d181af99c4.tar.zst
nixpkgs-7ec04712423d47148f98fe3c935c60d181af99c4.zip
treewide: s/xlibs/xorg/g (#36889)
Diffstat (limited to 'pkgs/games/steam')
-rw-r--r--pkgs/games/steam/chrootenv.nix16
-rw-r--r--pkgs/games/steam/runtime-wrapped.nix24
2 files changed, 20 insertions, 20 deletions
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 8fd8c3d7d20..88cde733176 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -15,7 +15,7 @@ let
       pciutils
       python2
       # Games' dependencies
-      xlibs.xrandr
+      xorg.xrandr
       which
       # Needed by gdialog, including in the steam-runtime
       perl
@@ -51,12 +51,12 @@ in buildFHSUserEnv rec {
 
   multiPkgs = pkgs: with pkgs; [
     # These are required by steam with proper errors
-    xlibs.libXcomposite
-    xlibs.libXtst
-    xlibs.libXrandr
-    xlibs.libXext
-    xlibs.libX11
-    xlibs.libXfixes
+    xorg.libXcomposite
+    xorg.libXtst
+    xorg.libXrandr
+    xorg.libXext
+    xorg.libX11
+    xorg.libXfixes
 
     # Needed to properly check for libGL.so.1 in steam-wrapper.sh
     pkgsi686Linux.glxinfo
@@ -67,7 +67,7 @@ in buildFHSUserEnv rec {
     libdrm
     mono
     xorg.xkeyboardconfig
-    xlibs.libpciaccess
+    xorg.libpciaccess
 
     (steamPackages.steam-runtime-wrapped.override {
       inherit nativeOnly runtimeOnly;
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 2030425ba12..5412a1be518 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -15,15 +15,15 @@ let
     gdk_pixbuf
 
     # Without these it silently fails
-    xlibs.libXinerama
-    xlibs.libXdamage
-    xlibs.libXcursor
-    xlibs.libXrender
-    xlibs.libXScrnSaver
-    xlibs.libXxf86vm
-    xlibs.libXi
-    xlibs.libSM
-    xlibs.libICE
+    xorg.libXinerama
+    xorg.libXdamage
+    xorg.libXcursor
+    xorg.libXrender
+    xorg.libXScrnSaver
+    xorg.libXxf86vm
+    xorg.libXi
+    xorg.libSM
+    xorg.libICE
     gnome2.GConf
     freetype
     (curl.override { gnutlsSupport = true; sslSupport = false; })
@@ -46,8 +46,8 @@ let
     networkmanager098
 
     # Verified games requirements
-    xlibs.libXmu
-    xlibs.libxcb
+    xorg.libXmu
+    xorg.libxcb
     libGLU
     libuuid
     libogg
@@ -60,7 +60,7 @@ let
     tbb
 
     # Other things from runtime
-    xlibs.libXinerama
+    xorg.libXinerama
     flac
     freeglut
     libjpeg