diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-12-05 13:43:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-05 13:43:40 -0600 |
| commit | ab22183941afd99a29b6ea5cc1c12ec391cd453f (patch) | |
| tree | b453447ed4bb4895a19da9d53714818bf5857642 /pkgs/applications/graphics | |
| parent | e9a44ba62713b0a333fb6eb034f79e6b85efd73a (diff) | |
| parent | 73a87b57a620fb7408e32da18a3983b794e63cfc (diff) | |
| download | nixlib-ab22183941afd99a29b6ea5cc1c12ec391cd453f.tar nixlib-ab22183941afd99a29b6ea5cc1c12ec391cd453f.tar.gz nixlib-ab22183941afd99a29b6ea5cc1c12ec391cd453f.tar.bz2 nixlib-ab22183941afd99a29b6ea5cc1c12ec391cd453f.tar.lz nixlib-ab22183941afd99a29b6ea5cc1c12ec391cd453f.tar.xz nixlib-ab22183941afd99a29b6ea5cc1c12ec391cd453f.tar.zst nixlib-ab22183941afd99a29b6ea5cc1c12ec391cd453f.zip | |
Merge pull request #51469 from matthewbauer/gimp-fix
gimp: fix on darwin
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/gimp/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 201ebf7b2984..4d835e6590ed 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -3,7 +3,7 @@ , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 , harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr -, AppKit, Cocoa, gtk-mac-integration }: +, AppKit, Cocoa, gtk-mac-integration-gtk2, cf-private }: let inherit (python2Packages) pygtk wrapPython python; @@ -23,8 +23,11 @@ in stdenv.mkDerivation rec { freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ] - ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # cf-private is needed to get some things not in swift-corefoundation. + # For instance _OBJC_CLASS_$_NSArray is missing. + AppKit Cocoa gtk-mac-integration-gtk2 cf-private + ] ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; pythonPath = [ pygtk ]; @@ -69,7 +72,9 @@ in stdenv.mkDerivation rec { "--with-icc-directory=/var/run/current-system/sw/share/color/icc" ]; - doCheck = true; + # on Darwin, + # test-eevl.c:64:36: error: initializer element is not a compile-time constant + doCheck = !stdenv.isDarwin; enableParallelBuilding = true; |