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
base: 2fb5dac372fe
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b3c18fe2be0e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 2 contributors

Commits on May 4, 2020

  1. apitrace: fix OpenGL library path and Qt GUI (#86475) 

    For unknown reasons, Apitrace breaks the runpath of the traced program.
OpenGL programs on nix are looking at /run/opengl-driver/lib to find the
system OpenGL driver.

This change:

- add path /run/opengl-driver{-32} to the RPATH of the wrapper
libraries. This fixs tracing with `apitrace trace`.
- add rpath to `libglnvd` and `libGL` to the `{e}glretrace` binaries.
These libraries are loaded at runtime, but does not appears as NEEDED in
the binaries, hence the need for the explicit rpath addition. This fix
`{e}glretrace`.
- Explicitly add Qt wrapper to `qapitrace`. It fixs the GUI.

Co-authored-by: Florian Klink <flokli@flokli.de>

Co-authored-by: Florian Klink <flokli@flokli.de>
    @guibou @flokli
    guibou and flokli committed May 4, 2020
    Copy the full SHA
    b3c18fe View commit details
    Browse the repository at this point in the history