Merge pull request #174101 from sifmelcara/krita-5.0.6
This commit is contained in:
commit
1e5de56d87
|
@ -1,7 +1,7 @@
|
||||||
{ callPackage, ... } @ args:
|
{ callPackage, ... } @ args:
|
||||||
|
|
||||||
callPackage ./generic.nix (args // {
|
callPackage ./generic.nix (args // {
|
||||||
version = "5.0.2";
|
version = "5.0.6";
|
||||||
kde-channel = "stable";
|
kde-channel = "stable";
|
||||||
sha256 = "sha256-5nUfx+tQSXekiAo3brvTmVyH2tFUSGCE6COX5l1JnL8=";
|
sha256 = "sha256:0qhf7vm13v33yk67n7wdcgrqpk7yvajdlkqcp7zhrl2z7qdnvmzd";
|
||||||
})
|
})
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
|
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
|
||||||
, kio, kcrash, breeze-icons
|
, kio, kcrash, breeze-icons
|
||||||
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
|
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
|
||||||
, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase
|
, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase, libmypaint, libwebp
|
||||||
, qtmultimedia, qtx11extras, quazip
|
, qtmultimedia, qtx11extras, quazip
|
||||||
, python3Packages
|
, python3Packages
|
||||||
|
|
||||||
|
@ -23,13 +23,13 @@ mkDerivation rec {
|
||||||
inherit sha256;
|
inherit sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
|
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
|
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
|
||||||
ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
|
ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
|
||||||
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
|
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
|
||||||
openjpeg opencolorio_1 poppler curl ilmbase
|
openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp
|
||||||
qtmultimedia qtx11extras quazip
|
qtmultimedia qtx11extras quazip
|
||||||
python3Packages.pyqt5
|
python3Packages.pyqt5
|
||||||
] ++ lib.optional stdenv.hostPlatform.isx86 vc;
|
] ++ lib.optional stdenv.hostPlatform.isx86 vc;
|
||||||
|
@ -37,6 +37,17 @@ mkDerivation rec {
|
||||||
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]
|
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]
|
||||||
++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy";
|
++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy";
|
||||||
|
|
||||||
|
# Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script.
|
||||||
|
# Patch the PYTHONPATH so python scripts can import sip successfully.
|
||||||
|
postPatch = let
|
||||||
|
pythonPath = python3Packages.makePythonPath (with python3Packages; [ sip setuptools ]);
|
||||||
|
in ''
|
||||||
|
substituteInPlace cmake/modules/FindSIP.cmake \
|
||||||
|
--replace 'PYTHONPATH=''${_sip_python_path}' 'PYTHONPATH=${pythonPath}'
|
||||||
|
substituteInPlace cmake/modules/SIPMacros.cmake \
|
||||||
|
--replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}'
|
||||||
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
|
"-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
|
||||||
"-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
|
"-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
|
||||||
|
@ -52,7 +63,7 @@ mkDerivation rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A free and open source painting application";
|
description = "A free and open source painting application";
|
||||||
homepage = "https://krita.org/";
|
homepage = "https://krita.org/";
|
||||||
maintainers = with maintainers; [ abbradar ];
|
maintainers = with maintainers; [ abbradar sifmelcara ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
license = licenses.gpl3Only;
|
license = licenses.gpl3Only;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue