diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-11-03 18:37:39 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-11-03 18:59:24 +0100 |
| commit | 80a5dd7f0277f37b90ccf65b6a94635dd7b45311 (patch) | |
| tree | 9ad8c6694b8dd4fa205ded9490de61b7923454cc | |
| parent | f3a81474045e817192b860a45abf357d4a7c0aea (diff) | |
| download | nixlib-80a5dd7f0277f37b90ccf65b6a94635dd7b45311.tar nixlib-80a5dd7f0277f37b90ccf65b6a94635dd7b45311.tar.gz nixlib-80a5dd7f0277f37b90ccf65b6a94635dd7b45311.tar.bz2 nixlib-80a5dd7f0277f37b90ccf65b6a94635dd7b45311.tar.lz nixlib-80a5dd7f0277f37b90ccf65b6a94635dd7b45311.tar.xz nixlib-80a5dd7f0277f37b90ccf65b6a94635dd7b45311.tar.zst nixlib-80a5dd7f0277f37b90ccf65b6a94635dd7b45311.zip | |
gegl: fix darwin build
../gegl/opencl/cl_gl.h:37:10: fatal error: 'OpenGL/CGLDevice.h' file not found
#include <OpenGL/CGLDevice.h>
| -rw-r--r-- | pkgs/development/libraries/gegl/4.0.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 8632035caf7b..2edb47cb9bb4 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -28,6 +28,7 @@ , libwebp , luajit , openexr +, OpenCL }: stdenv.mkDerivation rec { @@ -86,7 +87,7 @@ stdenv.mkDerivation rec { gexiv2 luajit openexr - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin OpenCL; # for gegl-4.0.pc 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 ''; - doCheck = true; + # tests fail to connect to the com.apple.fonts daemon in sandboxed mode + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { description = "Graph-based image processing framework"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a98e59e8b6c6..4b0d6743a7f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11063,7 +11063,9 @@ in 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 {}; |