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: 372b00dfe984
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6096a4de4895
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 31, 2018

  1. libglvnd: patch from upstream for libdl

    @dtzWill
    dtzWill committed Mar 31, 2018
    Copy the full SHA
    2367250 View commit details

  2. Merge pull request #38170 from dtzWill/fix/libglvnd-libdl-from-upstream 

    libglvnd: patch from upstream for libdl
    @dtzWill
    dtzWill authored Mar 31, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6096a4d View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/development/libraries/libglvnd/default.nix
9 changes: 8 additions & 1 deletion pkgs/development/libraries/libglvnd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }:

let
driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
@@ -22,6 +22,13 @@ in stdenv.mkDerivation rec {
"-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
];

# Upstream patch fixing use of libdl, should be in next release.
patches = [
(fetchpatch {
url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch";
sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d";
})
];
outputs = [ "out" "dev" ];

passthru = { inherit driverLink; };