From 872695d02b9a8f23d7e0cca0ab6331039ca3c108 Mon Sep 17 00:00:00 2001 From: nek0 Date: Sun, 12 Jun 2022 13:02:13 +0200 Subject: [PATCH 1/3] krita: fix double wrapping --- pkgs/applications/graphics/krita/generic.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 825e8882a557..aaab492734fa 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -54,10 +54,8 @@ mkDerivation rec { "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ]; - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done + preInstall = '' + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; meta = with lib; { From c602569c9de4d51bb1cd9d5f0c88c914cd183ae5 Mon Sep 17 00:00:00 2001 From: nek0 Date: Sun, 12 Jun 2022 13:14:28 +0200 Subject: [PATCH 2/3] maintainers: add nek0 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/graphics/krita/generic.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9fa9646cacbc..ee77b5974788 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9117,6 +9117,12 @@ githubId = 166791; name = "Neil Mayhew"; }; + nek0 = { + email = "nek0@nek0.eu"; + github = "nek0"; + githubId = 1859691; + name = "Amedeo Molnár"; + }; nelsonjeppesen = { email = "nix@jeppesen.io"; github = "NelsonJeppesen"; diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index aaab492734fa..d5f778b592ac 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -61,7 +61,7 @@ mkDerivation rec { meta = with lib; { description = "A free and open source painting application"; homepage = "https://krita.org/"; - maintainers = with maintainers; [ abbradar sifmelcara ]; + maintainers = with maintainers; [ abbradar sifmelcara nek0 ]; platforms = platforms.linux; license = licenses.gpl3Only; }; From b25f38ac4e210f88aaf394471e11b002b79b11e2 Mon Sep 17 00:00:00 2001 From: nek0 Date: Sun, 12 Jun 2022 13:46:03 +0200 Subject: [PATCH 3/3] krita: 5.0.6 -> 5.0.8 fix saving bug --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 4aea1c4d9813..603c1a44f4f2 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.0.6"; + version = "5.0.8"; kde-channel = "stable"; - sha256 = "sha256:0qhf7vm13v33yk67n7wdcgrqpk7yvajdlkqcp7zhrl2z7qdnvmzd"; + sha256 = "sha256:7R0fpQc+4MQVDh/enhCTgpgOqU0y5YRShrv/ILa/XkU="; })