From 59ef9e5a1647abb4e16063192fb72f51e0799a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Feb 2021 14:50:58 +0100 Subject: [PATCH] rclone-browser: use Qt 5.15 --- pkgs/applications/networking/sync/rclone/browser.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix index 8dbbc0cf2218..1917fc40c0ee 100644 --- a/pkgs/applications/networking/sync/rclone/browser.nix +++ b/pkgs/applications/networking/sync/rclone/browser.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a34c0778c2a0..53a9edb2f025 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24558,7 +24558,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 { };