about summary refs log tree commit diff
path: root/pkgs/applications/graphics/gimp
diff options
context:
space:
mode:
authorCillian de Róiste <goibhniu@fsfe.org>2013-11-10 23:33:45 +0100
committerCillian de Róiste <goibhniu@fsfe.org>2013-11-10 23:35:03 +0100
commit01266013a5975511cf80b535ad7c650d62764185 (patch)
tree48f0eb83e815103276964754e7b1094d3ff39cbd /pkgs/applications/graphics/gimp
parentb8bbc87ab16882ba0eb98d4e6ac3c58a980fd1ca (diff)
downloadnixlib-01266013a5975511cf80b535ad7c650d62764185.tar
nixlib-01266013a5975511cf80b535ad7c650d62764185.tar.gz
nixlib-01266013a5975511cf80b535ad7c650d62764185.tar.bz2
nixlib-01266013a5975511cf80b535ad7c650d62764185.tar.lz
nixlib-01266013a5975511cf80b535ad7c650d62764185.tar.xz
nixlib-01266013a5975511cf80b535ad7c650d62764185.tar.zst
nixlib-01266013a5975511cf80b535ad7c650d62764185.zip
gimpPlugins.gmic: upgrade from 1.3.2.0 to 1.5.7.4, fix compilation with gimp 2.8
Only the gimp plugin is built now, as the rest of the suite is quite
large and probably deserves its own package.
Diffstat (limited to 'pkgs/applications/graphics/gimp')
-rw-r--r--pkgs/applications/graphics/gimp/plugins/default.nix20
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index ef9060d00c3e..234249e85626 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -143,21 +143,23 @@ rec {
     installPhase = "installPlugins src/gimp-lqr-plugin";
   };
 
-  # this is more than a gimp plugin !
-  # it can be made to compile the gimp plugin only though..
   gmic =
-  let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough?
-  in pluginDerivation {
-      name = "gmic-1.3.2.0";
-      buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
+  let
+    imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough?
+    fftw = pkgs.fftw.override {pthreads = true;};
+  in pluginDerivation rec {
+      name = "gmic-1.5.7.2";
+      buildInputs = [imagemagick pkgconfig fftw gimp] ++ gimp.nativeBuildInputs;
       src = fetchurl {
-        url = mirror://sourceforge/gmic/gmic_1.3.2.0.tar.gz;
-        sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h";
+        url = mirror://sourceforge/gmic/gmic_1.5.7.2.tar.gz;
+        sha256 = "1cpbxb3p2c8bcv2cbr150whapzjc7w09i3jza0z9x3xj8c0vdyv1";
       };
       preConfigure = ''
         export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${imagemagick}/include/ImageMagick"
       '';
-      installPhase = "installPlugins src/gmic4gimp";
+      sourceRoot = "${name}/src";
+      buildPhase = "make gimp";
+      installPhase = "installPlugins gmic_gimp";
       meta = { 
         description = "script language for image processing which comes with its open-source interpreter";
         homepage = http://gmic.sourceforge.net/repository.shtml;