From 06271b6eba7ce754a305df1d90925de976b915d2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 23 Jun 2017 21:48:41 +0200 Subject: [PATCH] krita: Fix build dependencies First of all, we need a newer version of Vc, because at least version 1.1.0 is required for Krita 3.1.3. Also, qtmultimedia and qtx11extras were missing. Built and tested successfully on my machine. Signed-off-by: aszlig Cc: @abbradar --- pkgs/applications/graphics/krita/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 121afdf2084b..50720f854dbf 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -4,6 +4,7 @@ , kio, kcrash , boost, libraw, fftw, eigen, exiv2, lcms2, gsl, openexr , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase +, qtmultimedia, qtx11extras }: mkDerivation rec { @@ -23,6 +24,7 @@ mkDerivation rec { ki18n kitemmodels kitemviews kwindowsystem kio kcrash boost libraw fftw eigen exiv2 lcms2 gsl openexr openjpeg opencolorio vc poppler_qt5 curl ilmbase + qtmultimedia qtx11extras ]; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b7b80fb4d20..b99290127f30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14698,7 +14698,6 @@ with pkgs; konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; krita = libsForQt5.callPackage ../applications/graphics/krita { - vc = vc_0_7; openjpeg = openjpeg_1; };