diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
| commit | 78b7529ee36603182ae34354d7cbc3dcfc228317 (patch) | |
| tree | 26a9555518aa403f9328dc1a72680e823e3630de /pkgs/development/libraries/gegl | |
| parent | f3886a6fba7dec4d5c97a51558ab0a4489f89d76 (diff) | |
| parent | 4d4980d9f88956f533ecad905c92ab70f0e8cbad (diff) | |
| download | nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.gz nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.bz2 nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.lz nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.xz nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.zst nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.zip | |
Merge branch 'master' into staging
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 ]; |