diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-11 17:12:04 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-11 17:12:04 -0400 |
| commit | 81387c2e783a783368162af085984811727be538 (patch) | |
| tree | 38c1b854f0dd2d37d8bdd828789895b2e8f1445f /pkgs/applications/graphics | |
| parent | ee4b56edd364922c6a20a8d7b21a5a72497b4bc2 (diff) | |
| parent | 0a77a728954460725a7346d6f180283048ed77c2 (diff) | |
| download | nixlib-81387c2e783a783368162af085984811727be538.tar nixlib-81387c2e783a783368162af085984811727be538.tar.gz nixlib-81387c2e783a783368162af085984811727be538.tar.bz2 nixlib-81387c2e783a783368162af085984811727be538.tar.lz nixlib-81387c2e783a783368162af085984811727be538.tar.xz nixlib-81387c2e783a783368162af085984811727be538.tar.zst nixlib-81387c2e783a783368162af085984811727be538.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/gimp/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 2536367f6ceb..80bc2d49efce 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -43,11 +43,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc buildInputs = [ - babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes libgudev + babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ] + ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; pythonPath = [ pygtk ]; |