Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gimp: revert broken gimp-2.6 dependencies #114

Merged
merged 1 commit into from
Aug 23, 2012
Merged

gimp: revert broken gimp-2.6 dependencies #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/applications/graphics/gimp/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk, freetype
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng12, libexif, zlib, perl
, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22
}:

stdenv.mkDerivation rec {
Expand All @@ -13,8 +13,8 @@ stdenv.mkDerivation rec {

buildInputs = [
pkgconfig gtk freetype fontconfig
libart_lgpl libtiff libjpeg libpng libexif zlib perl
perlXMLParser python pygtk gettext intltool babl gegl
libart_lgpl libtiff libjpeg libpng12 libexif zlib perl
perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22
];

passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
Expand Down
16 changes: 16 additions & 0 deletions pkgs/development/libraries/babl/0_0_22.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation {
name = "babl-0.0.22";

src = fetchurl {
url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2;
sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s";
};

meta = {
description = "Image pixel format conversion library";
homepage = http://gegl.org/babl/;
license = "GPL3";
};
}
21 changes: 21 additions & 0 deletions pkgs/development/libraries/gegl/0_0_22.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg
, librsvg, pango, gtk }:

stdenv.mkDerivation {
name = "gegl-0.0.22";

src = fetchurl {
url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2;
sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5";
};

configureFlags = "--disable-docs"; # needs fonts otherwise don't know how to pass them

buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ];

meta = {
description = "Graph-based image processing framework";
homepage = http://www.gegl.org;
license = "GPL3";
};
}
9 changes: 8 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3273,6 +3273,8 @@ let

axis = callPackage ../development/libraries/axis { };

babl_0_0_22 = callPackage ../development/libraries/babl/0_0_22.nix { };

babl = callPackage ../development/libraries/babl { };

beecrypt = callPackage ../development/libraries/beecrypt { };
Expand Down Expand Up @@ -3526,6 +3528,9 @@ let
# avocodec avformat librsvg
};

gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix {
# avocodec avformat librsvg
};
geoclue = callPackage ../development/libraries/geoclue {};

geoip = builderDefsPackage ../development/libraries/geoip {
Expand Down Expand Up @@ -6891,14 +6896,16 @@ let

get_iplayer = callPackage ../applications/misc/get_iplayer {};

gimp = callPackage ../applications/graphics/gimp {
gimp_2_6 = callPackage ../applications/graphics/gimp {
inherit (gnome) libart_lgpl;
};

gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
inherit (gnome) libart_lgpl;
};

gimp = gimp_2_6;

gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins {
inherit pkgs gimp;
});
Expand Down