cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #240547 from wegank/libepoxy-x11-darwin

Browse source 
libepoxy: fix x11 support on darwin
This commit is contained in:
Weijia Wang 2023-06-30 09:39:38 +03:00 committed by GitHub
commit 4fe6f7cc75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,10 +13,6 @@
, x11Support ? !stdenv.isDarwin , x11Support ? !stdenv.isDarwin
}: }:
let
inherit (lib) getLib optional optionalString;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libepoxy"; pname = "libepoxy";
version = "1.5.10"; version = "1.5.10";
@ -33,7 +29,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
patchShebangs src/*.py patchShebangs src/*.py
'' ''
+ optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin ''
substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
''; '';
@ -41,8 +37,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ];
buildInputs = lib.optionals x11Support [ buildInputs = lib.optionals (x11Support && !stdenv.isDarwin) [
libGL libGL
] ++ lib.optionals x11Support [
libX11 libX11
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
Carbon Carbon
@ -56,7 +53,7 @@ stdenv.mkDerivation rec {
"-Dx11=${lib.boolToString x11Support}" "-Dx11=${lib.boolToString x11Support}"
]; ];
env.NIX_CFLAGS_COMPILE = lib.optionalString x11Support ''-DLIBGL_PATH="${getLib libGL}/lib"''; env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"'';
# cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?)
preCheck = lib.optionalString stdenv.isDarwin '' preCheck = lib.optionalString stdenv.isDarwin ''