cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #111758 from dotlambda/rclone-browser-qt515

Browse source 
rclone-browser: use Qt 5.15
This commit is contained in:
Sandro 2021-02-03 21:28:59 +01:00 committed by GitHub
commit b6a71423d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/sync/rclone/browser.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, wrapQtAppsHook, qtbase }:
stdenv.mkDerivation rec {
pname = "rclone-browser";
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33";
};
patches = [
# patch for Qt 5.15, https://github.com/kapitainsky/RcloneBrowser/pull/126
(fetchpatch {
url = "https://github.com/kapitainsky/RcloneBrowser/commit/ce9cf52e9c584a2cc85a5fa814b0fd7fa9cf0152.patch";
sha256 = "0nm42flmaq7mva9j4dpp18i1xcv8gr08zfyb9apz1zwn79h1w0c8";
})
];
nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [ qtbase ];

2
pkgs/top-level/all-packages.nix
View file

@ -24566,7 +24566,7 @@ in
rclone = callPackage ../applications/networking/sync/rclone { };
rclone-browser = libsForQt514.callPackage ../applications/networking/sync/rclone/browser.nix { };
rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { };
rcs = callPackage ../applications/version-management/rcs { };