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

gegl: fix darwin build

Browse Source
This commit is contained in:
Matthew Bauer 2016-08-11 22:17:48 -05:00
parent 410fa4b427
commit 5ba0165034
2 changed files with 7 additions and 3 deletions
Show Stats 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 ];

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };