From 49bee199ddd662f9f2066d570a26a1e02bc098db Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Thu, 27 Sep 2018 19:28:23 +0200
Subject: add gmic-qt

---
 pkgs/tools/graphics/gmic-qt/default.nix | 75 +++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 pkgs/tools/graphics/gmic-qt/default.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
new file mode 100644
index 000000000000..65b1bc301fb3
--- /dev/null
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
+, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
+, withGimpPlugin ? true, gimp ? null}:
+
+assert withGimpPlugin -> gimp != null;
+
+let
+  version = "2.3.6";
+
+  gmic-version = "2.3.6";
+
+  # CMakeLists.txt is missing from the tarball and Makefile is terrible
+  #CMakeLists = fetchurl {
+  #  url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt";
+  #  sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg";
+  #};
+in stdenv.mkDerivation rec {
+  name = "gmic-qt-${version}";
+
+  srcs = [
+    (fetchFromGitHub {
+      owner = "c-koi";
+      repo = "gmic-qt";
+      rev = "9e992cff2db418032b849458f5c9443267c7162c";
+      sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";})
+    (fetchFromGitHub {
+      owner ="dtschump";
+      repo = "gmic";
+      rev = "3e9600c5c99cca3b389099909fc3a231e0a69d8e";
+      sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";})
+  ];
+
+  sourceRoot = "gmic-${gmic-version}";
+
+  #src = fetchgit {
+  #  url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
+  #  sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc";
+  #};
+
+  nativeBuildInputs = [ qt5.qmake ];
+
+  buildInputs = [
+    fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick
+  ] ++ stdenv.lib.optionals withGimpPlugin [ gimp gimp.gtk ];
+
+  #cmakeFlags = [
+  #  "-DBUILD_LIB_STATIC=OFF"
+  #  "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}"
+  #  "-DENABLE_DYNAMIC_LINKING=ON"
+  #] ++ stdenv.lib.optional withGimpPlugin "-DPLUGIN_INSTALL_PREFIX=${placeholder "gimpPlugin"}/${gimp.targetPluginDir}";
+
+  #postPatch = ''
+  #  cp ${CMakeLists} CMakeLists.txt
+  #'';
+
+  buildPhase = ''
+    make -C src CImg.h gmic_stdlib.h;
+    cd ../qmic-qt;
+    mkdir build;
+    qmake HOST=krita ..;
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin;
+    install -Dm755 "gmic-qt/gmic_krita_qt" "$out/gmic_krita_qt"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Krita plugin for the G'MIC image processing framework";
+    homepage = http://gmic.eu/;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+  };
+}
-- 
cgit 1.4.1


From c26f3baf7d4204521749f82d5255417a9633a090 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Thu, 27 Sep 2018 20:34:40 +0200
Subject: still trying

---
 pkgs/tools/graphics/gmic-qt/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 65b1bc301fb3..877ee4eb103d 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -18,16 +18,16 @@ in stdenv.mkDerivation rec {
   name = "gmic-qt-${version}";
 
   srcs = [
+    (fetchFromGitHub {
+      owner = "dtschump";
+      repo = "gmic";
+      rev = "3e9600c5c99cca3b389099909fc3a231e0a69d8e";
+      sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";})
     (fetchFromGitHub {
       owner = "c-koi";
       repo = "gmic-qt";
       rev = "9e992cff2db418032b849458f5c9443267c7162c";
       sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";})
-    (fetchFromGitHub {
-      owner ="dtschump";
-      repo = "gmic";
-      rev = "3e9600c5c99cca3b389099909fc3a231e0a69d8e";
-      sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";})
   ];
 
   sourceRoot = "gmic-${gmic-version}";
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick
-  ] ++ stdenv.lib.optionals withGimpPlugin [ gimp gimp.gtk ];
+  ];
 
   #cmakeFlags = [
   #  "-DBUILD_LIB_STATIC=OFF"
-- 
cgit 1.4.1


From b1995497f83299245a424d3e4337c57dac77d799 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Thu, 27 Sep 2018 22:41:26 +0200
Subject: thank you @Mic92

---
 pkgs/tools/graphics/gmic-qt/default.nix | 94 +++++++++++++++++----------------
 1 file changed, 49 insertions(+), 45 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 877ee4eb103d..2da42a994355 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -1,69 +1,73 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, withGimpPlugin ? true, gimp ? null}:
-
-assert withGimpPlugin -> gimp != null;
+, curl, krita
+, fetchgit, withGimpPlugin ? true, gimp }:
 
 let
   version = "2.3.6";
 
   gmic-version = "2.3.6";
 
-  # CMakeLists.txt is missing from the tarball and Makefile is terrible
-  #CMakeLists = fetchurl {
-  #  url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt";
-  #  sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg";
-  #};
 in stdenv.mkDerivation rec {
   name = "gmic-qt-${version}";
 
-  srcs = [
-    (fetchFromGitHub {
-      owner = "dtschump";
-      repo = "gmic";
-      rev = "3e9600c5c99cca3b389099909fc3a231e0a69d8e";
-      sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";})
-    (fetchFromGitHub {
-      owner = "c-koi";
-      repo = "gmic-qt";
-      rev = "9e992cff2db418032b849458f5c9443267c7162c";
-      sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";})
-  ];
+  gmic-community = fetchFromGitHub {
+    owner = "dtschump";
+    repo = "gmic-community";
+    rev = "3fd528f20a2a7d651e96078c205ff21efb9cdd1a";
+    sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2";
+  };
+
+  CImg = fetchgit {
+    url = "https://framagit.org/dtschump/CImg";
+    rev = "c523f0026f3b03831c0778335fe7c7661bf9a719";
+    sha256 = "13ja8immpjkm2xskddc920axq2rp4hc2sr5ghgvgy1rshc3lp8i8";
+  };
+
+  gmic_stdlib = fetchurl {
+    name = "gmic_stdlib.h";
+    url = "http://gmic.eu/gmic_stdlib236.h";
+    sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q";
+  };
 
-  sourceRoot = "gmic-${gmic-version}";
+  gmic = fetchFromGitHub {
+    owner = "dtschump";
+    repo = "gmic";
+    rev = "b9a6876684f40852ca39300c9d7e7d676cb81b14";
+    sha256 = "0f69r460lyfb021m7bs8s4rxa3png51cbp1izywsy3sprjd1s57p";
+  };
+
+  gmic_qt = fetchFromGitHub {
+    owner = "c-koi";
+    repo = "gmic-qt";
+    rev = "9e992cff2db418032b849458f5c9443267c7162c";
+    sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";
+  };
 
-  #src = fetchgit {
-  #  url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
-  #  sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc";
-  #};
+  unpackPhase = ''
+    cp -r ${gmic} gmic
+    ln -s ${gmic-community} gmic-community
+    cp -r ${gmic_qt} gmic_qt
+    chmod -R +w gmic gmic_qt
+    ln -s ${CImg} CImg
 
-  nativeBuildInputs = [ qt5.qmake ];
+    cp ${gmic_stdlib} gmic/gmic_stdlib.h
+
+    make -C gmic/src CImg.h gmic_stdlib.h
+    cd gmic_qt
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick
+    qt5.qtbase qt5.qttools gimp fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick curl krita
   ];
 
-  #cmakeFlags = [
-  #  "-DBUILD_LIB_STATIC=OFF"
-  #  "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}"
-  #  "-DENABLE_DYNAMIC_LINKING=ON"
-  #] ++ stdenv.lib.optional withGimpPlugin "-DPLUGIN_INSTALL_PREFIX=${placeholder "gimpPlugin"}/${gimp.targetPluginDir}";
-
-  #postPatch = ''
-  #  cp ${CMakeLists} CMakeLists.txt
-  #'';
-
-  buildPhase = ''
-    make -C src CImg.h gmic_stdlib.h;
-    cd ../qmic-qt;
-    mkdir build;
-    qmake HOST=krita ..;
-    make
-  '';
+  qmakeFlags = [ "HOST=krita" ];
 
   installPhase = ''
     mkdir -p $out/bin;
-    install -Dm755 "gmic-qt/gmic_krita_qt" "$out/gmic_krita_qt"
+    install -Dm755 gmic-qt/gmic_krita_qt "$out/gmic_krita_qt"
   '';
 
   meta = with stdenv.lib; {
-- 
cgit 1.4.1


From 04d5ff82754fc5e3c4aca101c03555c2ae8f2404 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Thu, 27 Sep 2018 23:48:43 +0200
Subject: fixing and cleaning

---
 pkgs/tools/graphics/gmic-qt/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 2da42a994355..0ee589783cde 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, curl, krita
+, curl, krita, gdk_pixbuf, cairo
 , fetchgit, withGimpPlugin ? true, gimp }:
 
 let
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
     chmod -R +w gmic gmic_qt
     ln -s ${CImg} CImg
 
-    cp ${gmic_stdlib} gmic/gmic_stdlib.h
+    cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
 
     make -C gmic/src CImg.h gmic_stdlib.h
     cd gmic_qt
@@ -60,10 +60,11 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    qt5.qtbase qt5.qttools gimp fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick curl krita
+    qt5.qtbase qt5.qttools gimp gdk_pixbuf fftw zlib libjpeg libtiff libpng
+    opencv openexr graphicsmagick curl cairo krita
   ];
 
-  qmakeFlags = [ "HOST=krita" ];
+  cmakeFlags = [ "-DGMIC_QT_HOST=krita" ];
 
   installPhase = ''
     mkdir -p $out/bin;
-- 
cgit 1.4.1


From 24775df8d292f0f0ed91b92d8e8d8ae016879484 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 00:41:12 +0200
Subject: final cleaning

---
 pkgs/tools/graphics/gmic-qt/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 0ee589783cde..b301ddaf0ff9 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, curl, krita, gdk_pixbuf, cairo
-, fetchgit, withGimpPlugin ? true, gimp }:
+, curl, krita
+, fetchgit }:
 
 let
   version = "2.3.6";
@@ -60,15 +60,15 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    qt5.qtbase qt5.qttools gimp gdk_pixbuf fftw zlib libjpeg libtiff libpng
-    opencv openexr graphicsmagick curl cairo krita
+    qt5.qtbase qt5.qttools fftw zlib libjpeg libtiff libpng
+    opencv openexr graphicsmagick curl krita
   ];
 
   cmakeFlags = [ "-DGMIC_QT_HOST=krita" ];
 
   installPhase = ''
     mkdir -p $out/bin;
-    install -Dm755 gmic-qt/gmic_krita_qt "$out/gmic_krita_qt"
+    install -Dm755 gmic_krita_qt "$out/bin/gmic_krita_qt"
   '';
 
   meta = with stdenv.lib; {
-- 
cgit 1.4.1


From 059286da56d4b4dbf5dd10bb7427b52e19daf460 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 13:40:46 +0200
Subject: moving stuff around

---
 pkgs/tools/graphics/gmic-qt/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index b301ddaf0ff9..65b88b4b15a3 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -6,8 +6,6 @@
 let
   version = "2.3.6";
 
-  gmic-version = "2.3.6";
-
 in stdenv.mkDerivation rec {
   name = "gmic-qt-${version}";
 
@@ -51,10 +49,13 @@ in stdenv.mkDerivation rec {
     chmod -R +w gmic gmic_qt
     ln -s ${CImg} CImg
 
+    cd gmic_qt
+  '';
+
+  preConfigure = ''
     cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
 
     make -C gmic/src CImg.h gmic_stdlib.h
-    cd gmic_qt
   '';
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
cgit 1.4.1


From ac4cfba4a77b7182676641f6f94740dc70bbc84e Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 13:53:21 +0200
Subject: sokoban

---
 pkgs/tools/graphics/gmic-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 65b88b4b15a3..2f88b2c8a878 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -49,12 +49,12 @@ in stdenv.mkDerivation rec {
     chmod -R +w gmic gmic_qt
     ln -s ${CImg} CImg
 
+    cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
+
     cd gmic_qt
   '';
 
   preConfigure = ''
-    cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
-
     make -C gmic/src CImg.h gmic_stdlib.h
   '';
 
-- 
cgit 1.4.1


From 6d77f41e58b7b6291221ba9e9fb3af83ca532b8f Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 14:01:44 +0200
Subject: use tags

---
 pkgs/tools/graphics/gmic-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 2f88b2c8a878..be923e286852 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -31,14 +31,14 @@ in stdenv.mkDerivation rec {
   gmic = fetchFromGitHub {
     owner = "dtschump";
     repo = "gmic";
-    rev = "b9a6876684f40852ca39300c9d7e7d676cb81b14";
+    rev = "v.${version}";
     sha256 = "0f69r460lyfb021m7bs8s4rxa3png51cbp1izywsy3sprjd1s57p";
   };
 
   gmic_qt = fetchFromGitHub {
     owner = "c-koi";
     repo = "gmic-qt";
-    rev = "9e992cff2db418032b849458f5c9443267c7162c";
+    rev = "v.${version}";
     sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";
   };
 
-- 
cgit 1.4.1


From 92211c0f4c20eb410c60d51ac902aee6073a1241 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 14:05:41 +0200
Subject: fix wrong location

---
 pkgs/tools/graphics/gmic-qt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index be923e286852..da498795ffb6 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
   '';
 
   preConfigure = ''
-    make -C gmic/src CImg.h gmic_stdlib.h
+    make -C ../gmic/src CImg.h gmic_stdlib.h
   '';
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
cgit 1.4.1


From 491a401f6f82e8ca76a352d25edd71626efe27d4 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 14:11:07 +0200
Subject: add clarification

---
 pkgs/tools/graphics/gmic-qt/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index da498795ffb6..19691ae6fc0e 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -24,6 +24,7 @@ in stdenv.mkDerivation rec {
 
   gmic_stdlib = fetchurl {
     name = "gmic_stdlib.h";
+    # Version should e in sync with gmic. Basically the version string without dots
     url = "http://gmic.eu/gmic_stdlib236.h";
     sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q";
   };
-- 
cgit 1.4.1


From b7f2c92d0669ed0d2c9a40beb63fd22957fb1e95 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 15:41:17 +0200
Subject: renaming and restructuring

---
 pkgs/tools/graphics/gmic-qt/default.nix       | 82 ---------------------------
 pkgs/tools/graphics/gmic_krita_qt/default.nix | 82 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 83 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/tools/graphics/gmic-qt/default.nix
 create mode 100644 pkgs/tools/graphics/gmic_krita_qt/default.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
deleted file mode 100644
index 19691ae6fc0e..000000000000
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
-, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, curl, krita
-, fetchgit }:
-
-let
-  version = "2.3.6";
-
-in stdenv.mkDerivation rec {
-  name = "gmic-qt-${version}";
-
-  gmic-community = fetchFromGitHub {
-    owner = "dtschump";
-    repo = "gmic-community";
-    rev = "3fd528f20a2a7d651e96078c205ff21efb9cdd1a";
-    sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2";
-  };
-
-  CImg = fetchgit {
-    url = "https://framagit.org/dtschump/CImg";
-    rev = "c523f0026f3b03831c0778335fe7c7661bf9a719";
-    sha256 = "13ja8immpjkm2xskddc920axq2rp4hc2sr5ghgvgy1rshc3lp8i8";
-  };
-
-  gmic_stdlib = fetchurl {
-    name = "gmic_stdlib.h";
-    # Version should e in sync with gmic. Basically the version string without dots
-    url = "http://gmic.eu/gmic_stdlib236.h";
-    sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q";
-  };
-
-  gmic = fetchFromGitHub {
-    owner = "dtschump";
-    repo = "gmic";
-    rev = "v.${version}";
-    sha256 = "0f69r460lyfb021m7bs8s4rxa3png51cbp1izywsy3sprjd1s57p";
-  };
-
-  gmic_qt = fetchFromGitHub {
-    owner = "c-koi";
-    repo = "gmic-qt";
-    rev = "v.${version}";
-    sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";
-  };
-
-  unpackPhase = ''
-    cp -r ${gmic} gmic
-    ln -s ${gmic-community} gmic-community
-    cp -r ${gmic_qt} gmic_qt
-    chmod -R +w gmic gmic_qt
-    ln -s ${CImg} CImg
-
-    cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
-
-    cd gmic_qt
-  '';
-
-  preConfigure = ''
-    make -C ../gmic/src CImg.h gmic_stdlib.h
-  '';
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  buildInputs = [
-    qt5.qtbase qt5.qttools fftw zlib libjpeg libtiff libpng
-    opencv openexr graphicsmagick curl krita
-  ];
-
-  cmakeFlags = [ "-DGMIC_QT_HOST=krita" ];
-
-  installPhase = ''
-    mkdir -p $out/bin;
-    install -Dm755 gmic_krita_qt "$out/bin/gmic_krita_qt"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Krita plugin for the G'MIC image processing framework";
-    homepage = http://gmic.eu/;
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
new file mode 100644
index 000000000000..899cac504780
--- /dev/null
+++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig
+, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
+, curl, krita, qtbase, qttools
+, fetchgit }:
+
+let
+  version = "2.3.6";
+
+in stdenv.mkDerivation rec {
+  name = "gmic_krita_qt-${version}";
+
+  gmic-community = fetchFromGitHub {
+    owner = "dtschump";
+    repo = "gmic-community";
+    rev = "3fd528f20a2a7d651e96078c205ff21efb9cdd1a";
+    sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2";
+  };
+
+  CImg = fetchgit {
+    url = "https://framagit.org/dtschump/CImg";
+    rev = "c523f0026f3b03831c0778335fe7c7661bf9a719";
+    sha256 = "13ja8immpjkm2xskddc920axq2rp4hc2sr5ghgvgy1rshc3lp8i8";
+  };
+
+  gmic_stdlib = fetchurl {
+    name = "gmic_stdlib.h";
+    # Version should e in sync with gmic. Basically the version string without dots
+    url = "http://gmic.eu/gmic_stdlib236.h";
+    sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q";
+  };
+
+  gmic = fetchFromGitHub {
+    owner = "dtschump";
+    repo = "gmic";
+    rev = "v.${version}";
+    sha256 = "0f69r460lyfb021m7bs8s4rxa3png51cbp1izywsy3sprjd1s57p";
+  };
+
+  gmic_qt = fetchFromGitHub {
+    owner = "c-koi";
+    repo = "gmic-qt";
+    rev = "v.${version}";
+    sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";
+  };
+
+  unpackPhase = ''
+    cp -r ${gmic} gmic
+    ln -s ${gmic-community} gmic-community
+    cp -r ${gmic_qt} gmic_qt
+    chmod -R +w gmic gmic_qt
+    ln -s ${CImg} CImg
+
+    cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
+
+    cd gmic_qt
+  '';
+
+  preConfigure = ''
+    make -C ../gmic/src CImg.h gmic_stdlib.h
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    qtbase qttools fftw zlib libjpeg libtiff libpng
+    opencv openexr graphicsmagick curl krita
+  ];
+
+  cmakeFlags = [ "-DGMIC_QT_HOST=krita" ];
+
+  installPhase = ''
+    mkdir -p $out/bin;
+    install -Dm755 gmic_krita_qt "$out/bin/gmic_krita_qt"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Krita plugin for the G'MIC image processing framework";
+    homepage = http://gmic.eu/;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0255694b1d7..62b2e97ed068 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1370,7 +1370,7 @@ with pkgs;
 
   gmic = callPackage ../tools/graphics/gmic { };
 
-  gmic-qt = callPackage ../tools/graphics/gmic-qt { };
+  gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { };
 
   goa = callPackage ../development/tools/goa {
     buildGoPackage = buildGo110Package;
-- 
cgit 1.4.1


From 6ba1ef4a318224569d23265d6e35982a0e26f637 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 16:14:46 +0200
Subject: fix hash

---
 pkgs/tools/graphics/gmic_krita_qt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
index 899cac504780..8b75f2e5713d 100644
--- a/pkgs/tools/graphics/gmic_krita_qt/default.nix
+++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
     owner = "dtschump";
     repo = "gmic";
     rev = "v.${version}";
-    sha256 = "0f69r460lyfb021m7bs8s4rxa3png51cbp1izywsy3sprjd1s57p";
+    sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";
   };
 
   gmic_qt = fetchFromGitHub {
-- 
cgit 1.4.1


From 4303814b3002e00cfcbc04996bf50fb8ea574d52 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 16:22:20 +0200
Subject: fix CImg dependency

---
 pkgs/tools/graphics/gmic_krita_qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
index 8b75f2e5713d..14d47dc30bd8 100644
--- a/pkgs/tools/graphics/gmic_krita_qt/default.nix
+++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix
@@ -18,8 +18,8 @@ in stdenv.mkDerivation rec {
 
   CImg = fetchgit {
     url = "https://framagit.org/dtschump/CImg";
-    rev = "c523f0026f3b03831c0778335fe7c7661bf9a719";
-    sha256 = "13ja8immpjkm2xskddc920axq2rp4hc2sr5ghgvgy1rshc3lp8i8";
+    rev = "90f5657d8eab7b549ef945103ef680e747385805";
+    sha256 = "1af3dwqq18dkw0lz2gvnlw8y0kc1cw01hnc72rf3pg2wyjcp0pvc";
   };
 
   gmic_stdlib = fetchurl {
-- 
cgit 1.4.1