summary refs log tree commit diff
diff options
context:
space:
mode:
authornek0 <nek0@chelnok.de>2018-09-27 23:48:43 +0200
committernek0 <nek0@chelnok.de>2018-09-27 23:48:43 +0200
commit04d5ff82754fc5e3c4aca101c03555c2ae8f2404 (patch)
tree640f1fc01ad70a1dee754aec35497f5071e8f1c3
parentb1995497f83299245a424d3e4337c57dac77d799 (diff)
downloadnixlib-04d5ff82754fc5e3c4aca101c03555c2ae8f2404.tar
nixlib-04d5ff82754fc5e3c4aca101c03555c2ae8f2404.tar.gz
nixlib-04d5ff82754fc5e3c4aca101c03555c2ae8f2404.tar.bz2
nixlib-04d5ff82754fc5e3c4aca101c03555c2ae8f2404.tar.lz
nixlib-04d5ff82754fc5e3c4aca101c03555c2ae8f2404.tar.xz
nixlib-04d5ff82754fc5e3c4aca101c03555c2ae8f2404.tar.zst
nixlib-04d5ff82754fc5e3c4aca101c03555c2ae8f2404.zip
fixing and cleaning
-rw-r--r--pkgs/tools/graphics/gmic-qt/default.nix9
1 files changed, 5 insertions, 4 deletions
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;