From 17592f3f01ec3250ad735b8089483c534f688c7d Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 13 Oct 2024 11:05:52 -0300
Subject: [PATCH 1/3] vym: use standard callPackage

---
 pkgs/applications/misc/vym/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index 8a550ac4a79f..b685a5e1d8af 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -3,15 +3,15 @@
 , cmake
 , fetchFromGitHub
 , pkg-config
-, qtbase
-, qtscript
-, qtsvg
 , substituteAll
 , unzip
-, wrapQtAppsHook
 , zip
+, qt5
 }:
 
+let
+  inherit (qt5) qtbase qtscript qtsvg wrapQtAppsHook;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vym";
   version = "2.9.26";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b15df4f0cfde..3e7e728dddbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33402,7 +33402,7 @@ with pkgs;
 
   vwm = callPackage ../applications/window-managers/vwm { };
 
-  vym = libsForQt5.callPackage ../applications/misc/vym { };
+  vym = callPackage ../applications/misc/vym { };
 
   wad = callPackage ../tools/security/wad { };
 

From 1236eb79b30e5789dd71f97c6739af876ab5ffd6 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 13 Oct 2024 11:12:03 -0300
Subject: [PATCH 2/3] vym: nixfmt-rfc-style and hammer

- use lib.getExe
- put patches on a dedicated directory
---
 pkgs/applications/misc/vym/default.nix        | 50 ++++++++++++-------
 .../0000-fix-zip-paths.diff}                  |  0
 2 files changed, 32 insertions(+), 18 deletions(-)
 rename pkgs/applications/misc/vym/{000-fix-zip-paths.diff => patches/0000-fix-zip-paths.diff} (100%)

diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index b685a5e1d8af..bafae7dad58e 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -1,16 +1,22 @@
-{ lib
-, stdenv
-, cmake
-, fetchFromGitHub
-, pkg-config
-, substituteAll
-, unzip
-, zip
-, qt5
+{
+  lib,
+  cmake,
+  fetchFromGitHub,
+  pkg-config,
+  qt5,
+  stdenv,
+  substituteAll,
+  unzip,
+  zip,
 }:
 
 let
-  inherit (qt5) qtbase qtscript qtsvg wrapQtAppsHook;
+  inherit (qt5)
+    qtbase
+    qtscript
+    qtsvg
+    wrapQtAppsHook
+    ;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vym";
@@ -23,13 +29,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-5cHhv9GDjJvSqGJ+7fI0xaWCiXw/0WP0Bem/ZRV8Y7M=";
   };
 
-  outputs = [ "out" "man" ];
+  outputs = [
+    "out"
+    "man"
+  ];
 
   patches = [
     (substituteAll {
-      src = ./000-fix-zip-paths.diff;
-      zipPath = "${zip}/bin/zip";
-      unzipPath = "${unzip}/bin/unzip";
+      src = ./patches/0000-fix-zip-paths.diff;
+      zipPath = "${lib.getExe zip}";
+      unzipPath = "${lib.getExe unzip}";
     })
   ];
 
@@ -45,16 +54,20 @@ stdenv.mkDerivation (finalAttrs: {
     qtsvg
   ];
 
-  strictDeps = true;
-
   qtWrapperArgs = [
-    "--prefix PATH : ${lib.makeBinPath [ unzip zip ]}"
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        unzip
+        zip
+      ]
+    }"
   ];
 
+  strictDeps = true;
+
   meta = {
     homepage = "http://www.insilmaril.de/vym/";
     description = "Mind-mapping software";
-    mainProgram = "vym";
     longDescription = ''
       VYM (View Your Mind) is a tool to generate and manipulate maps which show
       your thoughts. Such maps can help you to improve your creativity and
@@ -67,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
       work with such maps.
     '';
     license = with lib.licenses; [ gpl2Plus ];
+    mainProgram = "vym";
     maintainers = with lib.maintainers; [ AndersonTorres ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/applications/misc/vym/000-fix-zip-paths.diff b/pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff
similarity index 100%
rename from pkgs/applications/misc/vym/000-fix-zip-paths.diff
rename to pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff

From fbd723ff804ed99058982559012a8ebcd637cda4 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 13 Oct 2024 11:40:24 -0300
Subject: [PATCH 3/3] vym: migrate to by-name

---
 .../misc/vym/default.nix => by-name/vy/vym/package.nix}         | 0
 .../misc => by-name/vy}/vym/patches/0000-fix-zip-paths.diff     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/vym/default.nix => by-name/vy/vym/package.nix} (100%)
 rename pkgs/{applications/misc => by-name/vy}/vym/patches/0000-fix-zip-paths.diff (100%)

diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/by-name/vy/vym/package.nix
similarity index 100%
rename from pkgs/applications/misc/vym/default.nix
rename to pkgs/by-name/vy/vym/package.nix
diff --git a/pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff b/pkgs/by-name/vy/vym/patches/0000-fix-zip-paths.diff
similarity index 100%
rename from pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff
rename to pkgs/by-name/vy/vym/patches/0000-fix-zip-paths.diff
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e7e728dddbd..94624ee12ea1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33402,8 +33402,6 @@ with pkgs;
 
   vwm = callPackage ../applications/window-managers/vwm { };
 
-  vym = callPackage ../applications/misc/vym { };
-
   wad = callPackage ../tools/security/wad { };
 
   wafw00f = callPackage ../tools/security/wafw00f { };