diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-03-24 06:26:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-24 06:26:53 -0400 |
| commit | 9437ec584a3bffd396a55c36b3d4ce764472fa72 (patch) | |
| tree | 80ba5ffc3586831b8325f5874a7e9c6130201d69 /pkgs/applications | |
| parent | 2c07a0800a76be01a3c255f39e21877a9a389f84 (diff) | |
| parent | 2001ceb7ae82a63a2f8fdc381a6da8d2b8b44fd3 (diff) | |
| download | nixpkgs-9437ec584a3bffd396a55c36b3d4ce764472fa72.tar nixpkgs-9437ec584a3bffd396a55c36b3d4ce764472fa72.tar.gz nixpkgs-9437ec584a3bffd396a55c36b3d4ce764472fa72.tar.bz2 nixpkgs-9437ec584a3bffd396a55c36b3d4ce764472fa72.tar.lz nixpkgs-9437ec584a3bffd396a55c36b3d4ce764472fa72.tar.xz nixpkgs-9437ec584a3bffd396a55c36b3d4ce764472fa72.tar.zst nixpkgs-9437ec584a3bffd396a55c36b3d4ce764472fa72.zip | |
Merge pull request #57511 from f--t/fix/krita-update
krita: 4.1.7.101 -> 4.1.8
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/krita/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index c9fdbd255d4..507cee548e0 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -5,27 +5,27 @@ , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , openjpeg, opencolorio, vc, poppler, curl, ilmbase , qtmultimedia, qtx11extras -, python3 +, python3Packages }: let major = "4.1"; -minor = "7"; -patch = "101"; +minor = "8"; +patch = null; in mkDerivation rec { name = "krita-${version}"; - version = "${major}.${minor}.${patch}"; + version = "${major}.${minor}"; src = fetchurl { url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; - sha256 = "0pvghb17vj3y19wa1n1zfg3yl5206ir3y45znrgdgdw076m5pjav"; + sha256 = "0h2rplc76r82b8smk61zci1ijj9xkjmf20pdqa8fc2lz4zicjxh4"; }; - nativeBuildInputs = [ cmake extra-cmake-modules ]; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons @@ -33,11 +33,17 @@ mkDerivation rec { boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib openjpeg opencolorio poppler curl ilmbase qtmultimedia qtx11extras - python3 + python3Packages.pyqt5 ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; + cmakeFlags = [ + "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5" + "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/share/sip/PyQt5" + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + ]; + meta = with lib; { description = "A free and open source painting application"; homepage = https://krita.org/; |