glxinfo: replace with mesa-demos (#324562)

NixOS · Aug 28, 2024 · 83d01be · 83d01be
2 parents fcda7e4 + d50e23f
commit 83d01be
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 69 deletions.
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@@ -63,7 +63,7 @@ with lib;
     # Firefox for reading the manual.
     firefox
 
-    glxinfo
+    mesa-demos
   ];
 
 }
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
@@ -17,5 +17,5 @@
   # Enable sound in virtualbox appliances.
   hardware.pulseaudio.enable = true;
 
-  environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ];
+  environment.systemPackages = [ pkgs.mesa-demos pkgs.firefox ];
 }
diff --git a/nixos/tests/turbovnc-headless-server.nix b/nixos/tests/turbovnc-headless-server.nix
@@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
   nodes.machine = { pkgs, ... }: {
 
     environment.systemPackages = with pkgs; [
-      glxinfo
+      mesa-demos
       procps # for `pkill`, `pidof` in the test
       scrot # for screenshotting Xorg
       turbovnc

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
@@ -13,7 +13,6 @@
 , file
 , fontsConf
 , git
-, glxinfo
 , gnugrep
 , gnused
 , gnutar
@@ -30,6 +29,7 @@
 , libX11
 , libxcb
 , libxkbcommon
+, mesa-demos
 , xcbutilwm
 , xcbutilrenderutil
 , xcbutilkeysyms
@@ -107,7 +107,7 @@ let
 
           # For Android emulator
           file
-          glxinfo
+          mesa-demos
           pciutils
           setxkbmap
 

diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix
@@ -6,7 +6,7 @@
 , kauth
 , libdrm
 , hwdata
-, glxinfo
+, mesa-demos
 , polkit
 , procps
 , pugixml
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec{
     karchive
     kauth
     libdrm
-    glxinfo
+    mesa-demos
     polkit
     procps
     pugixml
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec{
     "-DPOLKIT_POLICY_INSTALL_DIR=${placeholder "out"}/share/polkit-1/actions"
   ];
 
-  runtimeDeps = [ hwdata glxinfo vulkan-tools util-linux procps ];
+  runtimeDeps = [ hwdata mesa-demos vulkan-tools util-linux procps ];
   binPath = lib.makeBinPath runtimeDeps;
 
   dontWrapQtApps = true;

diff --git a/pkgs/applications/misc/gpu-viewer/default.nix b/pkgs/applications/misc/gpu-viewer/default.nix
@@ -12,7 +12,7 @@
 , wrapGAppsHook4
 , gdk-pixbuf
 , lsb-release
-, glxinfo
+, mesa-demos
 , vdpauinfo
 , clinfo
 }:
@@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec {
 
   postFixup = ''
     makeWrapper ${python3.interpreter} $out/bin/gpu-viewer \
-      --prefix PATH : "${lib.makeBinPath [ clinfo glxinfo lsb-release vdpauinfo vulkan-tools ]}" \
+      --prefix PATH : "${lib.makeBinPath [ clinfo lsb-release mesa-demos vdpauinfo vulkan-tools ]}" \
       --add-flags "$out/share/gpu-viewer/Files/GPUViewer.py" \
       --prefix PYTHONPATH : "$PYTHONPATH" \
       --chdir "$out/share/gpu-viewer/Files" \

diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
@@ -39,7 +39,7 @@
 , xrandr
 , pciutils
 , psmisc
-, glxinfo
+, mesa-demos
 , vulkan-tools
 , xboxdrv
 , pulseaudio
@@ -58,7 +58,7 @@ let
     xrandr
     pciutils
     psmisc
-    glxinfo
+    mesa-demos
     vulkan-tools
     xboxdrv
     pulseaudio

diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
@@ -3,10 +3,10 @@
 , fetchurl
 , cabextract
 , gettext
-, glxinfo
 , gnupg
 , icoutils
 , imagemagick
+, mesa-demos
 , netcat-gnu
 , p7zip
 , python3
@@ -37,10 +37,10 @@ let
     cabextract
     python
     gettext
-    glxinfo
     gnupg
     icoutils
     imagemagick
+    mesa-demos
     netcat-gnu
     p7zip
     unzip

diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
@@ -13,7 +13,7 @@
 , libogg, libvorbis, flac, libxslt
 , lzo, libcdio, libmodplug, libass, libbluray, libudfread
 , sqlite, libmysqlclient, nasm, gnutls, libva, libdrm
-, curl, bzip2, zip, unzip, glxinfo
+, curl, bzip2, zip, unzip, mesa-demos
 , libcec, libcec_platform, dcadec, libuuid
 , libcrossguid, libmicrohttpd
 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1
@@ -119,7 +119,7 @@ in stdenv.mkDerivation (finalAttrs: {
       libogg libvorbis flac libxslt systemd
       lzo libcdio libmodplug libass libbluray libudfread
       sqlite libmysqlclient avahi lame
-      curl bzip2 zip unzip glxinfo
+      curl bzip2 zip unzip mesa-demos
       libcec libcec_platform dcadec libuuid
       libxcrypt libgcrypt libgpg-error libunistring
       libcrossguid libplist
@@ -229,7 +229,7 @@ in stdenv.mkDerivation (finalAttrs: {
       # TODO: figure out which binaries should be wrapped this way and which shouldn't
       for p in $(ls --ignore=kodi-send $out/bin/) ; do
         wrapProgram $out/bin/$p \
-          --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ]
+          --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python mesa-demos ]
             ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \
           --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
               ([ curl systemd libmad libcec libcec_platform libass ]

diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix
@@ -9,7 +9,7 @@
   gamemode,
   glfw,
   glfw-wayland-minecraft,
-  glxinfo,
+  mesa-demos,
   jdk8,
   jdk17,
   jdk21,
@@ -134,7 +134,7 @@ symlinkJoin {
         ++ additionalLibs;
 
       runtimePrograms = [
-        glxinfo
+        mesa-demos
         pciutils # need lspci
         xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
       ] ++ additionalPrograms;

diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix
@@ -6,7 +6,7 @@
   cdrtools,
   curl,
   gawk,
-  glxinfo,
+  mesa-demos,
   gnugrep,
   gnused,
   jq,
@@ -49,7 +49,7 @@ let
       zsync
     ]
     ++ lib.optionals stdenv.isLinux [
-      glxinfo
+      mesa-demos
       usbutils
       xdg-user-dirs
     ];

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
@@ -1,5 +1,5 @@
 { makeScopeWithSplicing', generateSplicesForMkScope
-, stdenv, buildFHSEnv, pkgsi686Linux, glxinfo
+, stdenv, buildFHSEnv, pkgsi686Linux, mesa-demos
 }:
 
 let
@@ -14,10 +14,10 @@ let
     steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
     steam = callPackage ./steam.nix { };
     steam-fhsenv = callPackage ./fhsenv.nix {
-      glxinfo-i686 =
+      mesa-demos-i686 =
         if self.steamArch == "amd64"
-        then pkgsi686Linux.glxinfo
-        else glxinfo;
+        then pkgsi686Linux.mesa-demos
+        else mesa-demos;
       steam-runtime-wrapped-i686 =
         if self.steamArch == "amd64"
         then pkgsi686Linux.steamPackages.steam-runtime-wrapped

diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, writeShellScript, buildFHSEnv, steam, glxinfo-i686
+{ lib, stdenv, writeShellScript, buildFHSEnv, steam, mesa-demos-i686
 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null
 , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
 , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs
@@ -269,7 +269,7 @@ in buildFHSEnv rec {
 
   runScript = writeShellScript "steam-wrapper.sh" ''
     if [ -f /etc/NIXOS ]; then   # Check only useful on NixOS
-      ${glxinfo-i686}/bin/glxinfo 2>&1 | grep -q Error
+      ${mesa-demos-i686}/bin/glxinfo 2>&1 | grep -q Error
       # If there was an error running glxinfo, we know something is wrong with the configuration
       if [ $? -eq 0 ]; then
         cat <<EOF > /dev/stderr

diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix
@@ -6,7 +6,6 @@
 , substituteAll
 , coreutils
 , curl
-, glxinfo
 , gnugrep
 , gnused
 , xdg-utils
@@ -18,6 +17,7 @@
 , git
 , glslang
 , mako
+, mesa-demos
 , meson
 , ninja
 , pkg-config
@@ -131,9 +131,9 @@ stdenv.mkDerivation (finalAttrs: {
       path = lib.makeBinPath [
         coreutils
         curl
-        glxinfo
         gnugrep
         gnused
+        mesa-demos
         xdg-utils
       ];
 

diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
@@ -4,7 +4,7 @@
 , withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode
 , file, hddtemp, iproute2, ipmitool, usbutils, kmod, lm_sensors, smartmontools
 , binutils, tree, upower, pciutils
-, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg
+, withRecommendedDisplayInformationPrograms ? withRecommends, mesa-demos, xorg
 }:
 
 let
@@ -16,7 +16,7 @@ let
   ];
   recommendedDisplayInformationPrograms = lib.optionals
     withRecommendedDisplayInformationPrograms
-    ([ glxinfo ] ++ (with xorg; [ xdpyinfo xprop xrandr ]));
+    ([ mesa-demos ] ++ (with xorg; [ xdpyinfo xprop xrandr ]));
   programs = [ ps dnsutils ] # Core programs
     ++ recommendedSystemPrograms
     ++ recommendedDisplayInformationPrograms;

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
@@ -524,6 +524,7 @@ mapAliases ({
   glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11
   glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26
   glfw-wayland = glfw; # Added 2024-04-19
+  glxinfo = mesa-demos; # Added 2024-07-04
   gmailieer = lieer; # Added 2020-04-19
   gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02
   gnatboot11 = gnat-bootstrap11;

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -8126,8 +8126,6 @@ with pkgs;
 
   glogg = libsForQt5.callPackage ../tools/text/glogg { };
 
-  glxinfo = callPackage ../tools/graphics/glxinfo { };
-
   gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
   };
@@ -19868,9 +19866,9 @@ with pkgs;
       intel-media-driver
       intel-vaapi-driver
       mesa
+      mesa-demos
       libva-vdpau-driver
       libvdpau-va-gl
-      glxinfo
       vdpauinfo;
   };
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ with lib; @@
         # Firefox for reading the manual.
         firefox
-        glxinfo
+        mesa-demos
       ];
     }