From 5ba016503413770f571627366f557373ca31aacc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Aug 2016 22:17:48 -0500 Subject: [PATCH] gegl: fix darwin build --- pkgs/development/libraries/gegl/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 70b731f56dd..b54b3a38e76 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk, bzip2, intltool }: +, librsvg, pango, gtk, bzip2, intltool +, OpenGL ? null }: stdenv.mkDerivation rec { name = "gegl-0.2.0"; @@ -21,7 +22,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ] + ++ stdenv.lib.optional stdenv.isDarwin OpenGL; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2e8a1c5ac5..c0b6cba4958 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7298,7 +7298,9 @@ in gephi = callPackage ../applications/science/misc/gephi { }; - gegl = callPackage ../development/libraries/gegl { }; + gegl = callPackage ../development/libraries/gegl { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { };