diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2016-08-11 22:17:48 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2016-08-16 19:25:40 +0000 |
| commit | 5ba016503413770f571627366f557373ca31aacc (patch) | |
| tree | 65256164ab17990cd70f76c6da9b789975c1280b | |
| parent | 410fa4b427635d0c1cc916c9cd40e1d8edea2368 (diff) | |
| download | nixlib-5ba016503413770f571627366f557373ca31aacc.tar nixlib-5ba016503413770f571627366f557373ca31aacc.tar.gz nixlib-5ba016503413770f571627366f557373ca31aacc.tar.bz2 nixlib-5ba016503413770f571627366f557373ca31aacc.tar.lz nixlib-5ba016503413770f571627366f557373ca31aacc.tar.xz nixlib-5ba016503413770f571627366f557373ca31aacc.tar.zst nixlib-5ba016503413770f571627366f557373ca31aacc.zip | |
gegl: fix darwin build
| -rw-r--r-- | pkgs/development/libraries/gegl/default.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/default.nix b/pkgs/development/libraries/gegl/default.nix index 70b731f56dd1..b54b3a38e764 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 b2e8a1c5ac5f..c0b6cba49581 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 { }; |