diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/by-name/az/azpainter/package.nix
similarity index 55%
rename from pkgs/applications/graphics/azpainter/default.nix
rename to pkgs/by-name/az/azpainter/package.nix
index b1493b94ce67..dee38a7d7e8d 100644
--- a/pkgs/applications/graphics/azpainter/default.nix
+++ b/pkgs/by-name/az/azpainter/package.nix
@@ -1,34 +1,55 @@
-{ lib, stdenv, fetchFromGitLab
-, desktop-file-utils, shared-mime-info, ninja, pkg-config
-, libiconv
-, libX11, libXcursor, libXext, libXi
-, freetype, fontconfig
-, libjpeg, libpng, libtiff, libwebp
-, zlib
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  desktop-file-utils,
+  desktopToDarwinBundle,
+  shared-mime-info,
+  ninja,
+  pkg-config,
+  libiconv,
+  libX11,
+  libXcursor,
+  libXext,
+  libXi,
+  freetype,
+  fontconfig,
+  libjpeg,
+  libpng,
+  libtiff,
+  libwebp,
+  zlib,
 }:
 
 stdenv.mkDerivation rec {
   pname = "azpainter";
-  version = "3.0.8";
+  version = "3.0.9a";
 
   src = fetchFromGitLab {
     owner = "azelpg";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-NiQYX/Dcl/t30Jx08DKr6EP5ODS00pyEGKh/qiNT5t4=";
+    hash = "sha256-QWXlRbCGDk1DRtePeDM3tnbtkdlhbkn/oNTqHvmtEA4=";
   };
 
   nativeBuildInputs = [
     desktop-file-utils # for update-desktop-database
-    shared-mime-info   # for update-mime-info
+    shared-mime-info # for update-mime-info
     ninja
     pkg-config
-  ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   buildInputs = [
-    libX11 libXcursor libXext libXi
-    freetype fontconfig
-    libjpeg libpng libtiff libwebp
+    libX11
+    libXcursor
+    libXext
+    libXi
+    freetype
+    fontconfig
+    libjpeg
+    libpng
+    libtiff
+    libwebp
     zlib
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e41f182da81d..cc28af8ce0c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28150,8 +28150,6 @@ with pkgs;
 
   ax25-tools = callPackage ../applications/radio/ax25-tools { };
 
-  azpainter = callPackage ../applications/graphics/azpainter { };
-
   bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker {
     stdenv = if stdenv.hostPlatform.isDarwin then
       darwin.apple_sdk_11_0.stdenv