diff options
author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2016-08-24 11:52:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-24 11:52:27 +0200 |
commit | 3f337a2b23eab043fbea3b15796e7002dfa96751 (patch) | |
tree | adabe4dd64a11aedae79bb6e888347ee38a8487a /pkgs/development/libraries/gegl | |
parent | 76223aa4b2cc7ebda27a93f00829bd447701740a (diff) | |
parent | a6faa04ee45f1466335cfeb28cfa1b897e31a9b7 (diff) | |
download | nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.gz nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.bz2 nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.lz nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.xz nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.zst nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.zip |
Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
Diffstat (limited to 'pkgs/development/libraries/gegl')
-rw-r--r-- | pkgs/development/libraries/gegl/default.nix | 6 |
1 files changed, 4 insertions, 2 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 ]; |