diff --git a/pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch b/pkgs/by-name/an/android-file-transfer/darwin-dont-vendor-dependencies.patch similarity index 100% rename from pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch rename to pkgs/by-name/an/android-file-transfer/darwin-dont-vendor-dependencies.patch diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/by-name/an/android-file-transfer/package.nix similarity index 78% rename from pkgs/tools/filesystems/android-file-transfer/default.nix rename to pkgs/by-name/an/android-file-transfer/package.nix index d270cd8e7a6d..75c7db22608e 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/by-name/an/android-file-transfer/package.nix @@ -1,26 +1,23 @@ { lib, stdenv, - mkDerivation, fetchFromGitHub, cmake, - fuse, + fuse3, readline, pkg-config, - qtbase, - qttools, - wrapQtAppsHook, + qt6, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "android-file-transfer"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "sha256-1euoWM9KMauOkAp7g1FvY4olMiOg+La/Uk1QlQ3mKi8="; + sha256 = "sha256-G+ErwZ/F8Cl8WLSzC+5LrEWWqNZL3xDMBvx/gjkgAXk="; }; patches = [ ./darwin-dont-vendor-dependencies.patch ]; @@ -29,12 +26,12 @@ mkDerivation rec { cmake readline pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - fuse - qtbase - qttools + fuse3 + 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 7f068aabf77a..a47316c3b36d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16151,8 +16151,6 @@ with pkgs; ### MISC - android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; - antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; autotiling = python3Packages.callPackage ../misc/autotiling { };