Unverified Commit d50e23f0 authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

glxinfo: replace with mesa-demos

parent 277d1834

nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ with lib; 
    # Firefox for reading the manual.

    firefox



    glxinfo

    mesa-demos

  ];



}

nixos/modules/profiles/graphical.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

}

nixos/tests/turbovnc-headless-server.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/editors/android-studio/common.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

pkgs/applications/misc/corectrl/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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;