nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-01 17:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33001 from jtojnar/gimp-2.10-prep

Browse Source 
Preparation for GIMP 2.10
This commit is contained in:
Jan Tojnar 2017-12-23 18:55:14 +01:00 committed by GitHub
commit 976726706d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/gimp/2.8.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
, python2Packages, libart_lgpl, libexif, gettext, xorg , python2Packages, libexif, gettext, xorg
, AppKit, Cocoa, gtk-mac-integration }: , AppKit, Cocoa, gtk-mac-integration }:
let let
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
[ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo
freetype fontconfig lcms libpng libjpeg poppler libtiff webkit freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
libmng librsvg libwmf zlib libzip ghostscript aalib jasper libmng librsvg libwmf zlib libzip ghostscript aalib jasper
python pygtk libart_lgpl libexif gettext xorg.libXpm python pygtk libexif gettext xorg.libXpm
wrapPython wrapPython
] ]
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];

4
pkgs/development/libraries/gegl/3.0.nix
View File

@ -20,10 +20,12 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
buildInputs = [ buildInputs = [
babl libpng cairo libjpeg librsvg pango gtk bzip2 json_glib libpng cairo libjpeg librsvg pango gtk bzip2
libraw libwebp gnome3.gexiv2 libraw libwebp gnome3.gexiv2
]; ];
propagatedBuildInputs = [ glib json_glib babl ]; # for gegl-3.0.pc
nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ]; nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ];
meta = { meta = {

32
pkgs/development/libraries/libmypaint/default.nix Normal file
View File

@ -0,0 +1,32 @@
{stdenv, autoconf, automake, fetchFromGitHub, glib, intltool, json_c, libtool, pkgconfig}:
let
version = "1.3.0";
in stdenv.mkDerivation rec {
name = "libmypaint-${version}";
src = fetchFromGitHub {
owner = "mypaint";
repo = "libmypaint";
rev = "v${version}";
sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc";
};
nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ];
buildInputs = [ glib ];
propagatedBuildInputs = [ json_c ]; # for libmypaint.pc
doCheck = true;
preConfigure = "./autogen.sh";
meta = with stdenv.lib; {
homepage = http://mypaint.org/;
description = "Library for making brushstrokes which is used by MyPaint and other projects";
license = licenses.isc;
maintainers = with maintainers; [ goibhniu jtojnar ];
platforms = platforms.unix;
};
}

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

@ -9434,6 +9434,8 @@ with pkgs;
libmsgpack = callPackage ../development/libraries/libmsgpack { }; libmsgpack = callPackage ../development/libraries/libmsgpack { };
libmypaint = callPackage ../development/libraries/libmypaint { };
libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {
mysql = mysql57; mysql = mysql57;
}; };
@ -15073,7 +15075,6 @@ with pkgs;
ghq = gitAndTools.ghq; ghq = gitAndTools.ghq;
gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
inherit (gnome2) libart_lgpl;
webkit = null; webkit = null;
lcms = lcms2; lcms = lcms2;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;