b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libepoxy: disable glx on darwin by default

Browse source 
Originally enabled in

950261bb9a ('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.
This commit is contained in:
Dmitry Kalinkin 2021-12-31 15:39:01 -05:00 committed by Kerstin
parent 009de75a84
commit 438c50890a
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/gtk/3.x.nix
View file

@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libxkbcommon libxkbcommon
libepoxy (libepoxy.override { inherit x11Support; })
isocodes isocodes
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
AppKit AppKit

2
pkgs/development/libraries/gtk/4.x.nix
View file

@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
libpng libpng
libtiff libtiff
libjpeg libjpeg
libepoxy (libepoxy.override { inherit x11Support; })
isocodes isocodes
] ++ lib.optionals vulkanSupport [ ] ++ lib.optionals vulkanSupport [
vulkan-headers vulkan-headers

9
pkgs/development/libraries/libepoxy/default.nix
View file

@ -10,6 +10,7 @@
, libX11 , libX11
, Carbon , Carbon
, OpenGL , OpenGL
, x11Support ? !stdenv.isDarwin
}: }:
let let
@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ];
buildInputs = [ buildInputs = lib.optionals x11Support [
libGL libGL
libX11 libX11
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
@ -50,10 +51,10 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dtests=${if doCheck then "true" else "false"}" "-Dtests=${if doCheck then "true" else "false"}"
] "-Dglx=${if x11Support then "yes" else "no"}"
++ optional stdenv.isDarwin "-Dglx=yes"; ];
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?) # cgl_epoxy_api fails in darwin sandbox and on Hydra (because it's headless?)
preCheck = lib.optionalString stdenv.isDarwin '' preCheck = lib.optionalString stdenv.isDarwin ''