public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57511 from f--t/fix/krita-update

Browse Source 
krita: 4.1.7.101 -> 4.1.8
This commit is contained in:
worldofpeace 2019-03-24 06:26:53 -04:00 committed by GitHub
commit 9437ec584a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/graphics/krita/default.nix
View File

@ -5,27 +5,27 @@
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
, openjpeg, opencolorio, vc, poppler, curl, ilmbase , openjpeg, opencolorio, vc, poppler, curl, ilmbase
, qtmultimedia, qtx11extras , qtmultimedia, qtx11extras
, python3 , python3Packages
}: }:
let let
major = "4.1"; major = "4.1";
minor = "7"; minor = "8";
patch = "101"; patch = null;
in in
mkDerivation rec { mkDerivation rec {
name = "krita-${version}"; name = "krita-${version}";
version = "${major}.${minor}.${patch}"; version = "${major}.${minor}";
src = fetchurl { src = fetchurl {
url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; 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 = [ buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
@ -33,11 +33,17 @@ mkDerivation rec {
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
openjpeg opencolorio poppler curl ilmbase openjpeg opencolorio poppler curl ilmbase
qtmultimedia qtx11extras qtmultimedia qtx11extras
python3 python3Packages.pyqt5
] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; 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; { 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/;