Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 860c5ca4a7a7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c50207ceb30
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 2, 2020

  1. glxinfo: add eglinfo binary 

    XWayland master did not work correctly for OpenGL, during the bug
discussion upstream asked for the output of eglinfo. Add eglinfo to the
glxinfo package.
    @Emantor
    Emantor committed Apr 2, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    picnoir Félix
    GPG key ID: EFD315F31848DBA4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fbf575f View commit details

Commits on Jun 25, 2020

  1. Merge pull request #84110 from Emantor/topic/glxinfo_eglinfo 

    glxinfo: add eglinfo binary
    @markuskowa
    markuskowa authored Jun 25, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    picnoir Félix
    GPG key ID: EFD315F31848DBA4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4c50207 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/tools/graphics/glxinfo/default.nix
3 changes: 2 additions & 1 deletion pkgs/tools/graphics/glxinfo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
$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}
install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears} eglinfo
";

meta = with stdenv.lib; {