about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/tools/graphics/gmic_krita_qt/default.nix (renamed from pkgs/tools/graphics/gmic-qt/default.nix)8
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
index 19691ae6fc0e..899cac504780 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
+{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, curl, krita
+, curl, krita, qtbase, qttools
 , fetchgit }:
 
 let
   version = "2.3.6";
 
 in stdenv.mkDerivation rec {
-  name = "gmic-qt-${version}";
+  name = "gmic_krita_qt-${version}";
 
   gmic-community = fetchFromGitHub {
     owner = "dtschump";
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    qt5.qtbase qt5.qttools fftw zlib libjpeg libtiff libpng
+    qtbase qttools fftw zlib libjpeg libtiff libpng
     opencv openexr graphicsmagick curl krita
   ];
 
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;