diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-31 15:39:01 -0500 |
|---|---|---|
| committer | Kerstin <kerstin@erictapen.name> | 2022-01-03 01:02:23 +0100 |
| commit | 438c50890a0ef903d5765182027991b21ba1d892 (patch) | |
| tree | dcaab09487be89987674bd886b58615914d59e56 /pkgs/development/libraries/libepoxy | |
| parent | 009de75a84cf9420a1664087d47c0ff893b3001e (diff) | |
| download | nixpkgs-438c50890a0ef903d5765182027991b21ba1d892.tar nixpkgs-438c50890a0ef903d5765182027991b21ba1d892.tar.gz nixpkgs-438c50890a0ef903d5765182027991b21ba1d892.tar.bz2 nixpkgs-438c50890a0ef903d5765182027991b21ba1d892.tar.lz nixpkgs-438c50890a0ef903d5765182027991b21ba1d892.tar.xz nixpkgs-438c50890a0ef903d5765182027991b21ba1d892.tar.zst nixpkgs-438c50890a0ef903d5765182027991b21ba1d892.zip | |
libepoxy: disable glx on darwin by default
Originally enabled in
950261bb9a4bcc1ae959b76e8ee0f1c52819c304 ('darwin: fix gtk+3 dependencies')
since then many dependencies may have been changed to rely on Cocoa
only. Let's try disabling it by default to avoid the mesa dependency
on darwin, we can always enable on a case-by-case basis for apps that
really use X11.
Diffstat (limited to 'pkgs/development/libraries/libepoxy')
| -rw-r--r-- | pkgs/development/libraries/libepoxy/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index bb6d6a14232..c54c3c86d23 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -10,6 +10,7 @@ , libX11 , Carbon , OpenGL +, x11Support ? !stdenv.isDarwin }: let @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; - buildInputs = [ + buildInputs = lib.optionals x11Support [ libGL libX11 ] ++ lib.optionals stdenv.isDarwin [ @@ -50,10 +51,10 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtests=${if doCheck then "true" else "false"}" - ] - ++ optional stdenv.isDarwin "-Dglx=yes"; + "-Dglx=${if x11Support then "yes" else "no"}" + ]; - NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"''; + NIX_CFLAGS_COMPILE = lib.optionalString x11Support ''-DLIBGL_PATH="${getLib libGL}/lib"''; # cgl_epoxy_api fails in darwin sandbox and on Hydra (because it's headless?) preCheck = lib.optionalString stdenv.isDarwin '' |