From f9e9c67e53ba2fea76d1e7965e03ca2f78a26db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 19 May 2025 11:09:57 +0200 Subject: [PATCH] android-file-transfer: use qt6 --- .../filesystems/android-file-transfer/default.nix | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 42ec6256ddad..75c7db22608e 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,18 +1,15 @@ { lib, stdenv, - mkDerivation, fetchFromGitHub, cmake, fuse3, readline, pkg-config, - qtbase, - qttools, - wrapQtAppsHook, + qt6, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "android-file-transfer"; version = "4.5"; @@ -29,12 +26,12 @@ mkDerivation rec { cmake readline pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ fuse3 - qtbase - qttools + qt6.qtbase + qt6.qttools ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57c631edd034..4d5209cff3ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16170,7 +16170,7 @@ with pkgs; ### MISC - android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; + android-file-transfer = callPackage ../tools/filesystems/android-file-transfer { }; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };