public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
obadz
2016-08-24 11:57:44 +01:00
parent f3886a6fba 4d4980d9f8
commit 78b7529ee3
46 changed files with 363 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/gegl/default.nix
View File

@@ -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 ];