From ef21e949a0c761d9493d69ac231896c50b3e7115 Mon Sep 17 00:00:00 2001 From: Thra11 Date: Sat, 1 Sep 2018 19:25:38 +0100 Subject: [PATCH] krita: refactor to fix build on aarch64 (#45906) An optional dependency, Vc, doesn't currently provide any optimisations on aarch64 and causes a build failure in krita. Exclude it from the build inputs on arm and aarch64. --- pkgs/applications/graphics/krita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 836a78ce058..d4ac9720e15 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules +{ mkDerivation, lib, stdenv, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash @@ -23,10 +23,10 @@ mkDerivation rec { karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib - openjpeg opencolorio vc poppler_qt5 curl ilmbase + openjpeg opencolorio poppler_qt5 curl ilmbase qtmultimedia qtx11extras python3 - ]; + ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];