mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

gegl: fix darwin build

Browse source 
../gegl/opencl/cl_gl.h:37:10: fatal error: 'OpenGL/CGLDevice.h' file not found
    #include <OpenGL/CGLDevice.h>
This commit is contained in:
Daiderd Jordan 2019-11-03 18:37:39 +01:00
parent f3a8147404
commit 80a5dd7f02
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/gegl/4.0.nix
View file

@ -28,6 +28,7 @@
, libwebp , libwebp
, luajit , luajit
, openexr , openexr
, OpenCL
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -86,7 +87,7 @@ stdenv.mkDerivation rec {
gexiv2 gexiv2
luajit luajit
openexr openexr
]; ] ++ stdenv.lib.optional stdenv.isDarwin OpenCL;
# for gegl-4.0.pc # for gegl-4.0.pc
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -115,7 +116,8 @@ stdenv.mkDerivation rec {
patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh tools/xml_insert.sh patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh tools/xml_insert.sh
''; '';
doCheck = true; # tests fail to connect to the com.apple.fonts daemon in sandboxed mode
doCheck = !stdenv.isDarwin;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Graph-based image processing framework"; description = "Graph-based image processing framework";

4
pkgs/top-level/all-packages.nix
View file

@ -11063,7 +11063,9 @@ in
inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.frameworks) OpenGL;
}; };
gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { }; gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
inherit (darwin.apple_sdk.frameworks) OpenCL;
};
geoclue2 = callPackage ../development/libraries/geoclue {}; geoclue2 = callPackage ../development/libraries/geoclue {};