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: 00ffbc4b8c97
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f48197ead50c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 2, 2018

  1. epoxy: explicitly search libGL path as fallback

    Don't rely on questionable impact of DT_RPATH on dlopen().
    
    This is a bit of a messy subject, but probably the clearest
    reference to motivate *not* relying on how dlopen() behaves
    in the presence of RPATH or RUNPATH is the following:
    
    https://sourceware.org/ml/libc-hacker/2002-11/msg00011.html
    
    FWIW the dlopen() manpage only mentions the the RPATH
    and RUNPATH in the "executable file for the calling program";
    no mention of the executable files for libraries--
    this has been brought to the attention of the relevant
    parties and AFAICT nothing has been done.
    
    The best reference for glibc behavior is
    apparently to ... "try it and see".
    Luckily a generous soul did exactly that
    and reported the findings:
    
    https://www.spinics.net/lists/linux-man/msg02291.html
    
    Qt wrote on the subject a bit when they were bit by this,
    linking to the above articles (directly or indirectly).
    
    See:
    http://blog.qt.io/blog/2011/10/28/rpath-and-runpath/
    
    --------
    
    Since we know the path of libGL at build-time for libepoxy,
    there's a simple solution we can use to avoid all of this:
    simply teach libepoxy to explicitly look in the libGL path.
    
    This commit patches libepoxy to accomplish this,
    looking to "LIBGL_PATH" as a fallback if it cannot find
    the libraries otherwise.
    
    ---------
    
    This fixes use of libepoxy w/musl on NixOS!
    dtzWill committed Apr 2, 2018
    Copy the full SHA
    503f8ef View commit details
    Browse the repository at this point in the history
  2. Merge pull request #38168 from dtzWill/fix/epoxy-libgl-path

    epoxy: explicitly search libGL path as fallback
    dtzWill committed Apr 2, 2018
    Copy the full SHA
    f48197e View commit details
    Browse the repository at this point in the history