Applying the patch from Rok Garbas to add GIMP 2.8.0

svn path=/nixpkgs/trunk/; revision=34352

+86 -1
+33
pkgs/applications/graphics/gimp/2.8.0.nix
···
··· 1 + { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf 2 + , pango, cairo, freetype, fontconfig, lcms2, libpng, libjpeg, poppler, libtiff 3 + , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper 4 + , python, pygtk, libart_lgpl, libexif, gettext, xlibs }: 5 + 6 + stdenv.mkDerivation rec { 7 + name = "gimp-2.8.0"; 8 + 9 + src = fetchurl { 10 + url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; 11 + md5 = "28997d14055f15db063eb92e1c8a7ebb"; 12 + }; 13 + 14 + buildInputs = 15 + [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo 16 + freetype fontconfig lcms2 libpng libjpeg poppler libtiff webkit 17 + libmng librsvg libwmf zlib libzip ghostscript aalib jasper 18 + python pygtk libart_lgpl libexif gettext 19 + ]; 20 + 21 + passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ? 22 + 23 + #configureFlags = [ "--disable-print" ]; 24 + 25 + # "screenshot" needs this. 26 + NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib"; 27 + 28 + meta = { 29 + description = "The GNU Image Manipulation Program"; 30 + homepage = http://www.gimp.org/; 31 + license = "GPL"; 32 + }; 33 + }
+16
pkgs/development/libraries/babl/0.1.10.nix
···
··· 1 + { stdenv, fetchurl }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "babl-0.1.10"; 5 + 6 + src = fetchurl { 7 + url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; 8 + sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4"; 9 + }; 10 + 11 + meta = { 12 + description = "Image pixel format conversion library"; 13 + homepage = http://gegl.org/babl/; 14 + license = "GPL3"; 15 + }; 16 + }
+24
pkgs/development/libraries/gegl/0.2.0.nix
···
··· 1 + { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg 2 + , librsvg, pango, gtk, bzip2, intltool }: 3 + 4 + stdenv.mkDerivation rec { 5 + name = "gegl-0.2.0"; 6 + 7 + src = fetchurl { 8 + url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2"; 9 + sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; 10 + }; 11 + 12 + # needs fonts otherwise don't know how to pass them 13 + configureFlags = "--disable-docs"; 14 + 15 + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; 16 + 17 + buildNativeInputs = [ pkgconfig ]; 18 + 19 + meta = { 20 + description = "Graph-based image processing framework"; 21 + homepage = http://www.gegl.org; 22 + license = "GPL3"; 23 + }; 24 + }
+1 -1
pkgs/development/libraries/geoclue/default.nix
··· 14 baseName="geoclue"; 15 version="0.12.0"; 16 name="${baseName}-${version}"; 17 - url="http://folks.o-hand.com/jku/geoclue-releases/${name}.tar.gz"; 18 hash="15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; 19 }; 20 in
··· 14 baseName="geoclue"; 15 version="0.12.0"; 16 name="${baseName}-${version}"; 17 + url="https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz"; 18 hash="15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; 19 }; 20 in
+12
pkgs/top-level/all-packages.nix
··· 3180 3181 babl = callPackage ../development/libraries/babl { }; 3182 3183 beecrypt = callPackage ../development/libraries/beecrypt { }; 3184 3185 boehmgc = callPackage ../development/libraries/boehm-gc { }; ··· 3434 3435 gegl = callPackage ../development/libraries/gegl { 3436 # avocodec avformat librsvg 3437 }; 3438 3439 geoclue = callPackage ../development/libraries/geoclue {}; ··· 6761 6762 gimp = callPackage ../applications/graphics/gimp { 6763 inherit (gnome) libart_lgpl; 6764 }; 6765 6766 gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins {
··· 3180 3181 babl = callPackage ../development/libraries/babl { }; 3182 3183 + babl_0_1_10 = callPackage ../development/libraries/babl/0.1.10.nix {}; 3184 + 3185 beecrypt = callPackage ../development/libraries/beecrypt { }; 3186 3187 boehmgc = callPackage ../development/libraries/boehm-gc { }; ··· 3436 3437 gegl = callPackage ../development/libraries/gegl { 3438 # avocodec avformat librsvg 3439 + }; 3440 + 3441 + gegl_0_2_0 = callPackage ../development/libraries/gegl/0.2.0.nix { 3442 + babl = babl_0_1_10; 3443 }; 3444 3445 geoclue = callPackage ../development/libraries/geoclue {}; ··· 6767 6768 gimp = callPackage ../applications/graphics/gimp { 6769 inherit (gnome) libart_lgpl; 6770 + }; 6771 + 6772 + gimp_2_8_0 = callPackage ../applications/graphics/gimp/2.8.0.nix { 6773 + inherit (gnome) libart_lgpl; 6774 + babl = babl_0_1_10; 6775 + gegl = gegl_0_2_0; 6776 }; 6777 6778 gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins {