From 56728f632b90bfff5162a16e4c2457b42ad6f0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 8 Feb 2023 01:37:39 +0100 Subject: [PATCH] libGL: complete meta, get version from correct package --- pkgs/development/libraries/mesa/stubs.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/stubs.nix b/pkgs/development/libraries/mesa/stubs.nix index f3ea263cc9ff..773897548a42 100644 --- a/pkgs/development/libraries/mesa/stubs.nix +++ b/pkgs/development/libraries/mesa/stubs.nix @@ -1,12 +1,13 @@ { stdenv -, libglvnd, mesa +, libglvnd +, mesa , OpenGL , testers }: stdenv.mkDerivation (finalAttrs: { - inherit (libglvnd) version; pname = "libGL"; + inherit (if stdenv.hostPlatform.isDarwin then mesa else libglvnd) version; outputs = [ "out" "dev" ]; # On macOS, libglvnd is not supported, so we just use what mesa @@ -77,5 +78,10 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta.pkgConfigModules = [ "gl" "egl" "glesv1_cm" "glesv2" ]; + meta = { + description = "Stub bindings using " + (if stdenv.hostPlatform.isDarwin then "mesa" else "libglvnd"); + pkgConfigModules = [ "gl" "egl" "glesv1_cm" "glesv2" ]; + } // { + inherit (if stdenv.hostPlatform.isDarwin then mesa.meta else libglvnd.meta) homepage license platforms; + }; })