From 574a4f241d9bdcf2c4810ea7069b34b8c5b5470d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 4 May 2026 22:09:48 +0300 Subject: [PATCH] drawy: 1.0.0-alpha -> 1.0.0 Drawy has been adopted as a KDE project, so it's now significantly less of a pain to build. --- pkgs/by-name/dr/drawy/package.nix | 58 ++++++++++++++++--------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/dr/drawy/package.nix b/pkgs/by-name/dr/drawy/package.nix index dffa47955ffe..c743c0cf6a91 100644 --- a/pkgs/by-name/dr/drawy/package.nix +++ b/pkgs/by-name/dr/drawy/package.nix @@ -1,56 +1,58 @@ { lib, stdenv, - fetchFromGitHub, + fetchFromGitLab, cmake, + pkg-config, qt6, + shared-mime-info, + kdePackages, nix-update-script, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "drawy"; - version = "1.0.0-alpha-unstable-2025-11-17"; + version = "1.0.0"; - src = fetchFromGitHub { - owner = "Prayag2"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "graphics"; repo = "drawy"; - rev = "ca02b66a9615c45c78f2e29839a40c1e5bf8f71c"; - hash = "sha256-PzIeyhF/1wKD6JyybNRzruuxzSKJZvIq+L7X0rrcQUY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-K070SiIf2bj1r44tixUZbsLYDxT65lEW0g68ENg3ZiE="; }; strictDeps = true; nativeBuildInputs = [ cmake + pkg-config qt6.wrapQtAppsHook + shared-mime-info ]; - buildInputs = with qt6; [ - qtbase - qttools + buildInputs = [ + qt6.qtbase + qt6.qttools + + kdePackages.extra-cmake-modules + kdePackages.kconfig + kdePackages.kconfigwidgets + kdePackages.kcoreaddons + kdePackages.kcrash + kdePackages.kdoctools + kdePackages.ki18n + kdePackages.kiconthemes + kdePackages.kwidgetsaddons + kdePackages.kxmlgui + kdePackages.syntax-highlighting ]; - postInstall = '' - for size in 16 32 256 512; do - install -D --mode=644 \ - "$src"/assets/logo-$size.png \ - "$out/share/icons/hicolor/''${size}x''${size}/apps/drawy.png" - done - - install -D --mode=644 \ - "$src"/assets/logo.svg \ - "$out"/share/icons/hicolor/scalable/apps/drawy.svg - - install -D --mode=644 \ - "$src"/deploy/appimage/AppDir/usr/share/applications/drawy.desktop \ - --target-directory="$out"/share/applications - ''; - passthru.updateScript = nix-update-script { }; meta = { description = "Handy and infinite brainstorming tool"; - homepage = "https://github.com/Prayag2/drawy"; + homepage = "https://apps.kde.org/drawy/"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ yiyu @@ -59,4 +61,4 @@ stdenv.mkDerivation { mainProgram = "drawy"; platforms = lib.platforms.all; }; -} +})