Merge #215214: libGL: complete meta, correct version

...into staging

+9 -3
+9 -3
pkgs/development/libraries/mesa/stubs.nix
··· 1 1 { stdenv 2 - , libglvnd, mesa 2 + , libglvnd 3 + , mesa 3 4 , OpenGL 4 5 , testers 5 6 }: 6 7 7 8 stdenv.mkDerivation (finalAttrs: { 8 - inherit (libglvnd) version; 9 9 pname = "libGL"; 10 + inherit (if stdenv.hostPlatform.isDarwin then mesa else libglvnd) version; 10 11 outputs = [ "out" "dev" ]; 11 12 12 13 # On macOS, libglvnd is not supported, so we just use what mesa ··· 77 78 78 79 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 79 80 80 - meta.pkgConfigModules = [ "gl" "egl" "glesv1_cm" "glesv2" ]; 81 + meta = { 82 + description = "Stub bindings using " + (if stdenv.hostPlatform.isDarwin then "mesa" else "libglvnd"); 83 + pkgConfigModules = [ "gl" "egl" "glesv1_cm" "glesv2" ]; 84 + } // { 85 + inherit (if stdenv.hostPlatform.isDarwin then mesa.meta else libglvnd.meta) homepage license platforms; 86 + }; 81 87 })