From 9b36dd56390dd9dc79372397aea6567a95ebda7c Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:06:06 +0200 Subject: [PATCH] pineapple-pictures: move to by-name --- .../pi/pineapple-pictures/package.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{applications/graphics/pineapple-pictures/default.nix => by-name/pi/pineapple-pictures/package.nix} (88%) diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/by-name/pi/pineapple-pictures/package.nix similarity index 88% rename from pkgs/applications/graphics/pineapple-pictures/default.nix rename to pkgs/by-name/pi/pineapple-pictures/package.nix index 14fbe2072721..0b8e543982aa 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/by-name/pi/pineapple-pictures/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - qt6Packages, + qt6, exiv2, }: @@ -20,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - qt6Packages.qttools - qt6Packages.wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ - qt6Packages.qtsvg + qt6.qtsvg exiv2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e70df983dd2..e401cc20301e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10729,8 +10729,6 @@ with pkgs; inherit (pidginPackages) pidgin; - pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { }; - plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });