diff options
| author | Edmund Wu <fangkazuto@gmail.com> | 2019-10-02 10:18:58 -0400 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-10-22 10:01:56 +0200 |
| commit | 2d1a119ff8490a7274159cab786d54a93a934a82 (patch) | |
| tree | 601beab76c3e6755935caeda106c4eec93d85b4a | |
| parent | 7f69e4f2e8905b59cf2661fbd5036ba53648ca16 (diff) | |
| download | nixpkgs-2d1a119ff8490a7274159cab786d54a93a934a82.tar nixpkgs-2d1a119ff8490a7274159cab786d54a93a934a82.tar.gz nixpkgs-2d1a119ff8490a7274159cab786d54a93a934a82.tar.bz2 nixpkgs-2d1a119ff8490a7274159cab786d54a93a934a82.tar.lz nixpkgs-2d1a119ff8490a7274159cab786d54a93a934a82.tar.xz nixpkgs-2d1a119ff8490a7274159cab786d54a93a934a82.tar.zst nixpkgs-2d1a119ff8490a7274159cab786d54a93a934a82.zip | |
libglvnd: 1.0.0 -> 1.2.0
| -rw-r--r-- | pkgs/development/libraries/libglvnd/default.nix | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index b976c9c36b8..3d8272273a0 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif"; + sha256 = "1hyywwjsmvsd7di603f7iznjlccqlc7yvz0j59gax7bljm9wb6ni"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ]; @@ -32,17 +32,6 @@ stdenv.mkDerivation rec { # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; - # Upstream patch fixing use of libdl, should be in next release. - patches = [ - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch"; - sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d"; - }) - ] ++ stdenv.lib.optional stdenv.isDarwin - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/294ccb2f49107432567e116e13efac586580a4cc.patch"; - sha256 = "01339wg27cypv93221rhk3885vxbsg8kvbfyia77jmjdcnwrdwm2"; - }); outputs = [ "out" "dev" ]; # Set RUNPATH so that libGLX can find driver libraries in /run/opengl-driver(-32)/lib. |