From 259565656c0107a3f112d41c120ab9ef4e79b5d3 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Wed, 8 Dec 2021 00:54:15 -0800 Subject: [PATCH] libepoxy: fix build on darwin --- pkgs/development/libraries/libepoxy/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index bd9520da1c4f..86f6843bfb5a 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -8,6 +8,8 @@ , python3 , libGL , libX11 +, Carbon +, OpenGL }: let @@ -38,7 +40,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; - buildInputs = [ libGL libX11 ]; + buildInputs = [ + libGL + libX11 + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + OpenGL + ]; mesonFlags = [ "-Dtests=${if doCheck then "true" else "false"}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b65783f114f..ff8d86c27548 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16142,7 +16142,9 @@ with pkgs; entt = callPackage ../development/libraries/entt { }; - libepoxy = callPackage ../development/libraries/libepoxy {}; + libepoxy = callPackage ../development/libraries/libepoxy { + inherit (darwin.apple_sdk.frameworks) Carbon OpenGL; + }; libesmtp = callPackage ../development/libraries/libesmtp { };