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 +++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 82 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/graphics')

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;
+  };
+}
-- 
cgit 1.4.1