diff options
| -rw-r--r-- | pkgs/applications/graphics/krita/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/krita/generic.nix | 29 | ||||
| -rw-r--r-- | pkgs/by-name/ks/kseexpr/package.nix | 24 | ||||
| -rw-r--r-- | pkgs/by-name/la/lager/package.nix | 15 | ||||
| -rw-r--r-- | pkgs/by-name/zu/zug/package.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/libraries/fftw/default.nix | 11 |
6 files changed, 62 insertions, 37 deletions
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index e8e6a2cc9f867..ff6d8384195a7 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.1.5"; + version = "5.2.0"; kde-channel = "stable"; - sha256 = "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw"; + hash = "sha256-02oZc4pZw2dQucx1IuPJslWQGjOqwGmgeDgnUIqKkpc="; }) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index ba53a94f71076..195c96fe8ccf3 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -2,13 +2,14 @@ , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons -, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib, libjxl -, openjpeg, opencolorio, xsimd, poppler, curl, ilmbase, libmypaint, libwebp -, qtmultimedia, qtx11extras, quazip +, boost, libraw, fftw, eigen, exiv2, fribidi, libaom, libheif, libkdcraw, lcms2, gsl, openexr, giflib +, libjxl, mlt , openjpeg, opencolorio, xsimd, poppler, curl, ilmbase, immer, kseexpr, lager +, libmypaint , libunibreak, libwebp +, qtmultimedia, qtx11extras, quazip, SDL2, zug, pkg-config , python3Packages , version , kde-channel -, sha256 +, hash , callPackage }: @@ -18,16 +19,11 @@ mkDerivation rec { src = fetchurl { url = "https://download.kde.org/${kde-channel}/${pname}/${version}/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; patches = [ (fetchpatch { - name = "exiv2-0.28.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/raw/acd9a818660e86b14a66fceac295c2bab318c671/exiv2-0.28.patch"; - hash = "sha256-iD2pyid513ThJVeotUlVDrwYANofnEiZmWINNUm/saw="; - }) - (fetchpatch { name = "krita-opencolorio-2.3-compat.patch"; url = "https://invent.kde.org/graphics/krita/-/commit/520c633c2c868f2236d8e56eefecdcb6e3ebd840.patch"; hash = "sha256-eXsgBN8OnKjZOQsOxViPypts6CVh3L+IYKMB/mDUcfQ="; @@ -35,16 +31,15 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip makeWrapper ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons - boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib libjxl - openjpeg opencolorio poppler curl ilmbase libmypaint libwebp - qtmultimedia qtx11extras quazip + boost libraw fftw eigen exiv2 fribidi lcms2 gsl openexr lager libaom libheif libkdcraw giflib + libjxl mlt openjpeg opencolorio xsimd poppler curl ilmbase immer kseexpr libmypaint + libunibreak libwebp qtmultimedia qtx11extras quazip SDL2 zug python3Packages.pyqt5 - xsimd ]; env.NIX_CFLAGS_COMPILE = toString ([ "-I${ilmbase.dev}/include/OpenEXR" ] @@ -59,6 +54,9 @@ mkDerivation rec { --replace 'PYTHONPATH=''${_sip_python_path}' 'PYTHONPATH=${pythonPath}' substituteInPlace cmake/modules/SIPMacros.cmake \ --replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}' + + substituteInPlace plugins/impex/jp2/jp2_converter.cc \ + --replace '<openjpeg.h>' '<${openjpeg.incDir}/openjpeg.h>' ''; cmakeBuildType = "RelWithDebInfo"; @@ -66,6 +64,7 @@ mkDerivation rec { cmakeFlags = [ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON" ]; preInstall = '' diff --git a/pkgs/by-name/ks/kseexpr/package.nix b/pkgs/by-name/ks/kseexpr/package.nix index 59eb61a4e02ef..37e29c3a10ed2 100644 --- a/pkgs/by-name/ks/kseexpr/package.nix +++ b/pkgs/by-name/ks/kseexpr/package.nix @@ -1,20 +1,22 @@ -{ stdenv, lib +{ lib +, stdenv , fetchFromGitLab -, sd , cmake +, extra-cmake-modules , qt5 , libsForQt5 -, bison, flex, llvm, extra-cmake-modules +, bison +, flex +, llvm }: - stdenv.mkDerivation rec { pname = "kseexpr"; version = "4.0.4.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; - repo = pname; + repo = "kseexpr"; rev = "v${version}"; hash = "sha256-XjFGAN7kK2b0bLouYG3OhajhOQk4AgC4EQRzseccGCE="; }; @@ -22,11 +24,19 @@ stdenv.mkDerivation rec { # see https://github.com/NixOS/nixpkgs/issues/144170 ./cmake_libdir.patch ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + qt5.wrapQtAppsHook + ]; buildInputs = [ + bison + flex + libsForQt5.ki18n + llvm qt5.qtbase - bison flex llvm libsForQt5.ki18n ]; - nativeBuildInputs = [ cmake qt5.wrapQtAppsHook extra-cmake-modules ]; + meta = with lib; { homepage = "https://invent.kde.org/graphics/kseexpr"; description = "An embeddable expression evaluation engine"; diff --git a/pkgs/by-name/la/lager/package.nix b/pkgs/by-name/la/lager/package.nix index 05e9fdb893fa7..11b7595fcccb3 100644 --- a/pkgs/by-name/la/lager/package.nix +++ b/pkgs/by-name/la/lager/package.nix @@ -1,7 +1,11 @@ -{ callPackage, stdenv, lib +{ lib +, stdenv , fetchFromGitHub -, boost, immer, zug -, pkg-config, cmake +, cmake +, pkg-config +, boost +, immer +, zug }: stdenv.mkDerivation rec { @@ -9,7 +13,7 @@ stdenv.mkDerivation rec { version = "0.1.0"; src = fetchFromGitHub { owner = "arximboldi"; - repo = pname; + repo = "lager"; rev = "v${version}"; hash = "sha256-KTHrVV/186l4klwlcfDwFsKVoOVqWCUPzHnIbWuatbg="; }; @@ -22,12 +26,11 @@ stdenv.mkDerivation rec { cmake ]; cmakeFlags = [ - "-Dlager_BUILD_TESTS=OFF" "-Dlager_BUILD_EXAMPLES=OFF" ]; meta = with lib; { homepage = "https://github.com/arximboldi/lager"; - description = "library for functional interactive c++ programs"; + description = "C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++"; license = licenses.mit; maintainers = with maintainers; [ nek0 ]; }; diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix index 3626de7d98df9..f3356dd51ae65 100644 --- a/pkgs/by-name/zu/zug/package.nix +++ b/pkgs/by-name/zu/zug/package.nix @@ -1,6 +1,9 @@ -{ callPackage, stdenv, lib, pkgs, - fetchFromGitHub, - cmake, boost +{ lib +, stdenv +, pkgs +, fetchFromGitHub +, cmake +, boost }: @@ -9,16 +12,17 @@ stdenv.mkDerivation rec { version = "0.1.0"; src = fetchFromGitHub { owner = "arximboldi"; - repo = pname; + repo = "zug"; rev = "v${version}"; hash = "sha256-7xTMDhPIx1I1PiYNanGUsK8pdrWuemMWM7BW+NQs2BQ="; }; - buildInputs = [ + nativeBuildInputs = [ cmake + ]; + buildInputs = [ boost ]; cmakeFlags = [ - "-Dzug_BUILD_TESTS=OFF" "-Dzug_BUILD_EXAMPLES=OFF" ]; meta = with lib; { diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 026c1f3ed0636..7c06a346e4bb8 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , stdenv , lib , gfortran @@ -25,6 +26,14 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; }; + patches = [ + (fetchpatch { + name = "remove_missing_FFTW3LibraryDepends.patch"; + url = "https://github.com/FFTW/fftw3/pull/338/commits/f69fef7aa546d4477a2a3fd7f13fa8b2f6c54af7.patch"; + hash = "sha256-lzX9kAHDMY4A3Td8necXwYLcN6j8Wcegi3A7OIECKeU="; + }) + ]; + outputs = [ "out" "dev" "man" ] ++ lib.optional withDoc "info"; # it's dev-doc only outputBin = "dev"; # fftw-wisdom @@ -64,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Fastest Fourier Transform in the West library"; - homepage = "http://www.fftw.org/"; + homepage = "https://www.fftw.org/"; license = licenses.gpl2Plus; maintainers = [ ]; pkgConfigModules = [ |