From 0fc052a4f42112552ab10e27edcfa0439687beda Mon Sep 17 00:00:00 2001
From: "Miao, ZhiCheng" <zhicheng.miao@gmail.com>
Date: Fri, 5 May 2023 12:56:35 +0300
Subject: [PATCH] owncloud-client: improve nix expressions

---
 .../networking/owncloud-client/default.nix           | 12 +++++-------
 .../libre-graph-api-cpp-qt-client.nix                |  7 ++++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 36b1b88696ff..29f9ae7eb7bd 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , fetchFromGitHub
 , mkDerivation
 , pkg-config
@@ -7,12 +8,13 @@
 , callPackage
 , qtbase
 , qtkeychain
+, wrapQtAppsHook
 , qttools
 , sqlite
 , libsecret
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "owncloud-client";
   version = "3.2.1";
 
@@ -25,12 +27,8 @@ mkDerivation rec {
     hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE=";
   };
 
-  nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
-  buildInputs = [ qtbase qttools qtkeychain sqlite libsecret libregraph ];
-
-  qtWrapperArgs = [
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
-  ];
+  nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ];
+  buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ];
 
   cmakeFlags = [
     "-UCMAKE_INSTALL_LIBDIR"
diff --git a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix
index fb089cf09970..371432cb5fd6 100644
--- a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix
+++ b/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix
@@ -1,11 +1,12 @@
 { lib
+, stdenv
 , fetchFromGitHub
-, mkDerivation
 , cmake
 , qtbase
+, wrapQtAppsHook
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "libre-graph-api-cpp-qt-client";
   version = "0.13.2";
 
@@ -18,7 +19,7 @@ mkDerivation rec {
 
   sourceRoot = "source/client";
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake wrapQtAppsHook ];
   buildInputs = [ qtbase ];
 
   cmakeFlags = [  ];