Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-11-18 15:36:56 +01:00
438 changed files with 9353 additions and 6713 deletions
@@ -1,18 +1,18 @@
{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }:
{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase, qttools }:
mkDerivation rec {
pname = "android-file-transfer";
version = "3.9";
version = "4.0";
src = fetchFromGitHub {
owner = "whoozle";
repo = "android-file-transfer-linux";
rev = "v${version}";
sha256 = "1pwayyd5xrmngfrmv2vwr8ns2wi199xkxf7dks8fl9zmlpizg3c3";
sha256 = "11d4n4ybmc25gz18nlps3v11m3y8dw5bcb817gkik5m4nvqnbcsf";
};
nativeBuildInputs = [ cmake readline pkgconfig ];
buildInputs = [ fuse qtbase ];
buildInputs = [ fuse qtbase qttools ];
meta = with stdenv.lib; {
description = "Reliable MTP client with minimalistic UI";