trimage: migrate to pkgs/by-name

+14 -14
+14 -12
pkgs/applications/graphics/trimage/default.nix pkgs/by-name/tr/trimage/package.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchFromGitHub 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 4 5 5 - , python3 6 - , installShellFiles 7 - , makeWrapper 8 - , wrapQtAppsHook 6 + python3, 7 + installShellFiles, 8 + makeWrapper, 9 + qt5, 9 10 10 - , advancecomp 11 - , jpegoptim 12 - , optipng 13 - , pngcrush 11 + advancecomp, 12 + jpegoptim, 13 + optipng, 14 + pngcrush, 14 15 }: 15 16 16 17 let 17 18 pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]); 19 + 18 20 binPath = lib.makeBinPath [ 19 21 advancecomp 20 22 jpegoptim ··· 36 38 nativeBuildInputs = [ 37 39 installShellFiles 38 40 makeWrapper 39 - wrapQtAppsHook 41 + qt5.wrapQtAppsHook 40 42 ]; 41 43 42 44 dontWrapQtApps = true;
-2
pkgs/top-level/all-packages.nix
··· 1143 1143 inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security; 1144 1144 }; 1145 1145 1146 - trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; }; 1147 - 1148 1146 ufolint = with python3Packages; toPythonApplication ufolint; 1149 1147 1150 1148 valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };