From 77cbf2a1b176be674f1d12ce1b1eb01f33ca102e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 9 Nov 2024 22:46:01 +0100
Subject: [PATCH] trimage: migrate to pkgs/by-name

---
 .../tr/trimage/package.nix}                   | 26 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 14 deletions(-)
 rename pkgs/{applications/graphics/trimage/default.nix => by-name/tr/trimage/package.nix} (88%)

diff --git a/pkgs/applications/graphics/trimage/default.nix b/pkgs/by-name/tr/trimage/package.nix
similarity index 88%
rename from pkgs/applications/graphics/trimage/default.nix
rename to pkgs/by-name/tr/trimage/package.nix
index 6f38e22de14f..594930775a1c 100644
--- a/pkgs/applications/graphics/trimage/default.nix
+++ b/pkgs/by-name/tr/trimage/package.nix
@@ -1,20 +1,22 @@
-{ lib
-, stdenv
-, fetchFromGitHub
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
 
-, python3
-, installShellFiles
-, makeWrapper
-, wrapQtAppsHook
+  python3,
+  installShellFiles,
+  makeWrapper,
+  qt5,
 
-, advancecomp
-, jpegoptim
-, optipng
-, pngcrush
+  advancecomp,
+  jpegoptim,
+  optipng,
+  pngcrush,
 }:
 
 let
   pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]);
+
   binPath = lib.makeBinPath [
     advancecomp
     jpegoptim
@@ -36,7 +38,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     installShellFiles
     makeWrapper
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3226511390c..0d0f20c92215 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1143,8 +1143,6 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
   };
 
-  trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; };
-
   ufolint = with python3Packages; toPythonApplication ufolint;
 
   valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };