glxinfo: replace with mesa-demos
This commit is contained in:
parent
277d18341c
commit
d50e23f0a4
@ -63,7 +63,7 @@ with lib;
|
|||||||
# Firefox for reading the manual.
|
# Firefox for reading the manual.
|
||||||
firefox
|
firefox
|
||||||
|
|
||||||
glxinfo
|
mesa-demos
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -17,5 +17,5 @@
|
|||||||
# Enable sound in virtualbox appliances.
|
# Enable sound in virtualbox appliances.
|
||||||
hardware.pulseaudio.enable = true;
|
hardware.pulseaudio.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ];
|
environment.systemPackages = [ pkgs.mesa-demos pkgs.firefox ];
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
nodes.machine = { pkgs, ... }: {
|
nodes.machine = { pkgs, ... }: {
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
glxinfo
|
mesa-demos
|
||||||
procps # for `pkill`, `pidof` in the test
|
procps # for `pkill`, `pidof` in the test
|
||||||
scrot # for screenshotting Xorg
|
scrot # for screenshotting Xorg
|
||||||
turbovnc
|
turbovnc
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
, file
|
, file
|
||||||
, fontsConf
|
, fontsConf
|
||||||
, git
|
, git
|
||||||
, glxinfo
|
|
||||||
, gnugrep
|
, gnugrep
|
||||||
, gnused
|
, gnused
|
||||||
, gnutar
|
, gnutar
|
||||||
@ -30,6 +29,7 @@
|
|||||||
, libX11
|
, libX11
|
||||||
, libxcb
|
, libxcb
|
||||||
, libxkbcommon
|
, libxkbcommon
|
||||||
|
, mesa-demos
|
||||||
, xcbutilwm
|
, xcbutilwm
|
||||||
, xcbutilrenderutil
|
, xcbutilrenderutil
|
||||||
, xcbutilkeysyms
|
, xcbutilkeysyms
|
||||||
@ -107,7 +107,7 @@ let
|
|||||||
|
|
||||||
# For Android emulator
|
# For Android emulator
|
||||||
file
|
file
|
||||||
glxinfo
|
mesa-demos
|
||||||
pciutils
|
pciutils
|
||||||
setxkbmap
|
setxkbmap
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
, kauth
|
, kauth
|
||||||
, libdrm
|
, libdrm
|
||||||
, hwdata
|
, hwdata
|
||||||
, glxinfo
|
, mesa-demos
|
||||||
, polkit
|
, polkit
|
||||||
, procps
|
, procps
|
||||||
, pugixml
|
, pugixml
|
||||||
@ -46,7 +46,7 @@ stdenv.mkDerivation rec{
|
|||||||
karchive
|
karchive
|
||||||
kauth
|
kauth
|
||||||
libdrm
|
libdrm
|
||||||
glxinfo
|
mesa-demos
|
||||||
polkit
|
polkit
|
||||||
procps
|
procps
|
||||||
pugixml
|
pugixml
|
||||||
@ -68,7 +68,7 @@ stdenv.mkDerivation rec{
|
|||||||
"-DPOLKIT_POLICY_INSTALL_DIR=${placeholder "out"}/share/polkit-1/actions"
|
"-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;
|
binPath = lib.makeBinPath runtimeDeps;
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
, wrapGAppsHook4
|
, wrapGAppsHook4
|
||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
, lsb-release
|
, lsb-release
|
||||||
, glxinfo
|
, mesa-demos
|
||||||
, vdpauinfo
|
, vdpauinfo
|
||||||
, clinfo
|
, clinfo
|
||||||
}:
|
}:
|
||||||
@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
makeWrapper ${python3.interpreter} $out/bin/gpu-viewer \
|
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" \
|
--add-flags "$out/share/gpu-viewer/Files/GPUViewer.py" \
|
||||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||||
--chdir "$out/share/gpu-viewer/Files" \
|
--chdir "$out/share/gpu-viewer/Files" \
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
, xrandr
|
, xrandr
|
||||||
, pciutils
|
, pciutils
|
||||||
, psmisc
|
, psmisc
|
||||||
, glxinfo
|
, mesa-demos
|
||||||
, vulkan-tools
|
, vulkan-tools
|
||||||
, xboxdrv
|
, xboxdrv
|
||||||
, pulseaudio
|
, pulseaudio
|
||||||
@ -58,7 +58,7 @@ let
|
|||||||
xrandr
|
xrandr
|
||||||
pciutils
|
pciutils
|
||||||
psmisc
|
psmisc
|
||||||
glxinfo
|
mesa-demos
|
||||||
vulkan-tools
|
vulkan-tools
|
||||||
xboxdrv
|
xboxdrv
|
||||||
pulseaudio
|
pulseaudio
|
||||||
|
@ -3,10 +3,10 @@
|
|||||||
, fetchurl
|
, fetchurl
|
||||||
, cabextract
|
, cabextract
|
||||||
, gettext
|
, gettext
|
||||||
, glxinfo
|
|
||||||
, gnupg
|
, gnupg
|
||||||
, icoutils
|
, icoutils
|
||||||
, imagemagick
|
, imagemagick
|
||||||
|
, mesa-demos
|
||||||
, netcat-gnu
|
, netcat-gnu
|
||||||
, p7zip
|
, p7zip
|
||||||
, python3
|
, python3
|
||||||
@ -37,10 +37,10 @@ let
|
|||||||
cabextract
|
cabextract
|
||||||
python
|
python
|
||||||
gettext
|
gettext
|
||||||
glxinfo
|
|
||||||
gnupg
|
gnupg
|
||||||
icoutils
|
icoutils
|
||||||
imagemagick
|
imagemagick
|
||||||
|
mesa-demos
|
||||||
netcat-gnu
|
netcat-gnu
|
||||||
p7zip
|
p7zip
|
||||||
unzip
|
unzip
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
, libogg, libvorbis, flac, libxslt
|
, libogg, libvorbis, flac, libxslt
|
||||||
, lzo, libcdio, libmodplug, libass, libbluray, libudfread
|
, lzo, libcdio, libmodplug, libass, libbluray, libudfread
|
||||||
, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm
|
, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm
|
||||||
, curl, bzip2, zip, unzip, glxinfo
|
, curl, bzip2, zip, unzip, mesa-demos
|
||||||
, libcec, libcec_platform, dcadec, libuuid
|
, libcec, libcec_platform, dcadec, libuuid
|
||||||
, libcrossguid, libmicrohttpd
|
, libcrossguid, libmicrohttpd
|
||||||
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1
|
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1
|
||||||
@ -119,7 +119,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
|||||||
libogg libvorbis flac libxslt systemd
|
libogg libvorbis flac libxslt systemd
|
||||||
lzo libcdio libmodplug libass libbluray libudfread
|
lzo libcdio libmodplug libass libbluray libudfread
|
||||||
sqlite libmysqlclient avahi lame
|
sqlite libmysqlclient avahi lame
|
||||||
curl bzip2 zip unzip glxinfo
|
curl bzip2 zip unzip mesa-demos
|
||||||
libcec libcec_platform dcadec libuuid
|
libcec libcec_platform dcadec libuuid
|
||||||
libxcrypt libgcrypt libgpg-error libunistring
|
libxcrypt libgcrypt libgpg-error libunistring
|
||||||
libcrossguid libplist
|
libcrossguid libplist
|
||||||
@ -229,7 +229,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
|||||||
# TODO: figure out which binaries should be wrapped this way and which shouldn't
|
# TODO: figure out which binaries should be wrapped this way and which shouldn't
|
||||||
for p in $(ls --ignore=kodi-send $out/bin/) ; do
|
for p in $(ls --ignore=kodi-send $out/bin/) ; do
|
||||||
wrapProgram $out/bin/$p \
|
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)}" \
|
++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \
|
||||||
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
|
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
|
||||||
([ curl systemd libmad libcec libcec_platform libass ]
|
([ curl systemd libmad libcec libcec_platform libass ]
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
gamemode,
|
gamemode,
|
||||||
glfw,
|
glfw,
|
||||||
glfw-wayland-minecraft,
|
glfw-wayland-minecraft,
|
||||||
glxinfo,
|
mesa-demos,
|
||||||
jdk8,
|
jdk8,
|
||||||
jdk17,
|
jdk17,
|
||||||
jdk21,
|
jdk21,
|
||||||
@ -134,7 +134,7 @@ symlinkJoin {
|
|||||||
++ additionalLibs;
|
++ additionalLibs;
|
||||||
|
|
||||||
runtimePrograms = [
|
runtimePrograms = [
|
||||||
glxinfo
|
mesa-demos
|
||||||
pciutils # need lspci
|
pciutils # need lspci
|
||||||
xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
||||||
] ++ additionalPrograms;
|
] ++ additionalPrograms;
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
cdrtools,
|
cdrtools,
|
||||||
curl,
|
curl,
|
||||||
gawk,
|
gawk,
|
||||||
glxinfo,
|
mesa-demos,
|
||||||
gnugrep,
|
gnugrep,
|
||||||
gnused,
|
gnused,
|
||||||
jq,
|
jq,
|
||||||
@ -49,7 +49,7 @@ let
|
|||||||
zsync
|
zsync
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.isLinux [
|
++ lib.optionals stdenv.isLinux [
|
||||||
glxinfo
|
mesa-demos
|
||||||
usbutils
|
usbutils
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
];
|
];
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ makeScopeWithSplicing', generateSplicesForMkScope
|
{ makeScopeWithSplicing', generateSplicesForMkScope
|
||||||
, stdenv, buildFHSEnv, pkgsi686Linux, glxinfo
|
, stdenv, buildFHSEnv, pkgsi686Linux, mesa-demos
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -14,10 +14,10 @@ let
|
|||||||
steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
|
steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
|
||||||
steam = callPackage ./steam.nix { };
|
steam = callPackage ./steam.nix { };
|
||||||
steam-fhsenv = callPackage ./fhsenv.nix {
|
steam-fhsenv = callPackage ./fhsenv.nix {
|
||||||
glxinfo-i686 =
|
mesa-demos-i686 =
|
||||||
if self.steamArch == "amd64"
|
if self.steamArch == "amd64"
|
||||||
then pkgsi686Linux.glxinfo
|
then pkgsi686Linux.mesa-demos
|
||||||
else glxinfo;
|
else mesa-demos;
|
||||||
steam-runtime-wrapped-i686 =
|
steam-runtime-wrapped-i686 =
|
||||||
if self.steamArch == "amd64"
|
if self.steamArch == "amd64"
|
||||||
then pkgsi686Linux.steamPackages.steam-runtime-wrapped
|
then pkgsi686Linux.steamPackages.steam-runtime-wrapped
|
||||||
|
@ -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
|
, steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null
|
||||||
, extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
|
, extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
|
||||||
, extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs
|
, extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs
|
||||||
@ -269,7 +269,7 @@ in buildFHSEnv rec {
|
|||||||
|
|
||||||
runScript = writeShellScript "steam-wrapper.sh" ''
|
runScript = writeShellScript "steam-wrapper.sh" ''
|
||||||
if [ -f /etc/NIXOS ]; then # Check only useful on NixOS
|
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 there was an error running glxinfo, we know something is wrong with the configuration
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
cat <<EOF > /dev/stderr
|
cat <<EOF > /dev/stderr
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
{ lib, stdenv, fetchurl, libGL, libX11 }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "glxinfo";
|
|
||||||
version = "8.4.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-${version}.tar.bz2";
|
|
||||||
sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ libX11 libGL ];
|
|
||||||
|
|
||||||
dontConfigure = true;
|
|
||||||
|
|
||||||
buildPhase = "
|
|
||||||
$CC src/xdemos/{glxinfo.c,glinfo_common.c} -o glxinfo -lGL -lX11
|
|
||||||
$CC src/xdemos/glxgears.c -o glxgears -lGL -lX11 -lm
|
|
||||||
$CC src/egl/opengles2/es2_info.c -o es2_info -lEGL -lGLESv2 -lX11
|
|
||||||
$CC src/egl/opengles2/es2gears.c src/egl/eglut/{eglut.c,eglut_x11.c} -o es2gears -Isrc/egl/eglut -lEGL -lGLESv2 -lX11 -lm
|
|
||||||
$CC src/egl/opengl/eglinfo.c -o eglinfo -lEGL -lGLESv2 -lX11
|
|
||||||
";
|
|
||||||
|
|
||||||
installPhase = "
|
|
||||||
install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears} eglinfo
|
|
||||||
";
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Test utilities for OpenGL";
|
|
||||||
homepage = "https://www.mesa3d.org/";
|
|
||||||
license = licenses.mit;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = with maintainers; [ abbradar ];
|
|
||||||
};
|
|
||||||
}
|
|
@ -6,7 +6,6 @@
|
|||||||
, substituteAll
|
, substituteAll
|
||||||
, coreutils
|
, coreutils
|
||||||
, curl
|
, curl
|
||||||
, glxinfo
|
|
||||||
, gnugrep
|
, gnugrep
|
||||||
, gnused
|
, gnused
|
||||||
, xdg-utils
|
, xdg-utils
|
||||||
@ -18,6 +17,7 @@
|
|||||||
, git
|
, git
|
||||||
, glslang
|
, glslang
|
||||||
, mako
|
, mako
|
||||||
|
, mesa-demos
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
@ -131,9 +131,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
path = lib.makeBinPath [
|
path = lib.makeBinPath [
|
||||||
coreutils
|
coreutils
|
||||||
curl
|
curl
|
||||||
glxinfo
|
|
||||||
gnugrep
|
gnugrep
|
||||||
gnused
|
gnused
|
||||||
|
mesa-demos
|
||||||
xdg-utils
|
xdg-utils
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
, withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode
|
, withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode
|
||||||
, file, hddtemp, iproute2, ipmitool, usbutils, kmod, lm_sensors, smartmontools
|
, file, hddtemp, iproute2, ipmitool, usbutils, kmod, lm_sensors, smartmontools
|
||||||
, binutils, tree, upower, pciutils
|
, binutils, tree, upower, pciutils
|
||||||
, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg
|
, withRecommendedDisplayInformationPrograms ? withRecommends, mesa-demos, xorg
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -16,7 +16,7 @@ let
|
|||||||
];
|
];
|
||||||
recommendedDisplayInformationPrograms = lib.optionals
|
recommendedDisplayInformationPrograms = lib.optionals
|
||||||
withRecommendedDisplayInformationPrograms
|
withRecommendedDisplayInformationPrograms
|
||||||
([ glxinfo ] ++ (with xorg; [ xdpyinfo xprop xrandr ]));
|
([ mesa-demos ] ++ (with xorg; [ xdpyinfo xprop xrandr ]));
|
||||||
programs = [ ps dnsutils ] # Core programs
|
programs = [ ps dnsutils ] # Core programs
|
||||||
++ recommendedSystemPrograms
|
++ recommendedSystemPrograms
|
||||||
++ recommendedDisplayInformationPrograms;
|
++ recommendedDisplayInformationPrograms;
|
||||||
|
@ -524,6 +524,7 @@ mapAliases ({
|
|||||||
glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11
|
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
|
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
|
glfw-wayland = glfw; # Added 2024-04-19
|
||||||
|
glxinfo = mesa-demos; # Added 2024-07-04
|
||||||
gmailieer = lieer; # Added 2020-04-19
|
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
|
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;
|
gnatboot11 = gnat-bootstrap11;
|
||||||
|
@ -8126,8 +8126,6 @@ with pkgs;
|
|||||||
|
|
||||||
glogg = libsForQt5.callPackage ../tools/text/glogg { };
|
glogg = libsForQt5.callPackage ../tools/text/glogg { };
|
||||||
|
|
||||||
glxinfo = callPackage ../tools/graphics/glxinfo { };
|
|
||||||
|
|
||||||
gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect {
|
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;
|
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-media-driver
|
||||||
intel-vaapi-driver
|
intel-vaapi-driver
|
||||||
mesa
|
mesa
|
||||||
|
mesa-demos
|
||||||
libva-vdpau-driver
|
libva-vdpau-driver
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
glxinfo
|
|
||||||
vdpauinfo;
|
vdpauinfo;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user