From e393fe8e343a2424917f05dc2e357f7987d37d6e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 9 Nov 2024 22:51:53 +0100 Subject: [PATCH] texturepacker: migrate to pkgs/by-name --- .../te/texturepacker/package.nix} | 24 +++++++++---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 11 insertions(+), 15 deletions(-) rename pkgs/{applications/graphics/texturepacker/default.nix => by-name/te/texturepacker/package.nix} (86%) diff --git a/pkgs/applications/graphics/texturepacker/default.nix b/pkgs/by-name/te/texturepacker/package.nix similarity index 86% rename from pkgs/applications/graphics/texturepacker/default.nix rename to pkgs/by-name/te/texturepacker/package.nix index 37f07e9657a2..902f9e5f27e6 100644 --- a/pkgs/applications/graphics/texturepacker/default.nix +++ b/pkgs/by-name/te/texturepacker/package.nix @@ -1,12 +1,10 @@ -{ lib -, stdenv -, fetchurl -, dpkg -, autoPatchelfHook -, wrapQtAppsHook -, qtbase -, qtdeclarative -, qtsvg +{ + lib, + stdenv, + fetchurl, + dpkg, + autoPatchelfHook, + qt6, }: stdenv.mkDerivation (finalAttrs: { @@ -21,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ dpkg autoPatchelfHook - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtdeclarative - qtsvg + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3226511390c..36db12d410fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16105,8 +16105,6 @@ with pkgs; terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects ; - texturepacker = qt6.callPackage ../applications/graphics/texturepacker { }; - inherit (callPackage ../applications/graphics/tesseract { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; })