From d0b83ae0fa3b6bc30f1ba9557e5ec8f501ff8e71 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Thu, 26 Oct 2023 23:43:36 +0300 Subject: [PATCH] libre-graph-api-cpp-qt-client: refactor - move to pkgs/by-name --- .../li/libre-graph-api-cpp-qt-client/package.nix} | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) rename pkgs/{applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix => by-name/li/libre-graph-api-cpp-qt-client/package.nix} (79%) diff --git a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix similarity index 79% rename from pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix rename to pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix index 31412e72ec98..5fc90574d40f 100644 --- a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix +++ b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix @@ -2,8 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, qtbase -, wrapQtAppsHook +, qt6 }: stdenv.mkDerivation rec { @@ -19,15 +18,14 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/client"; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ qtbase ]; - - cmakeFlags = [ ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt6.qtbase ]; + dontWrapQtApps = true; meta = with lib; { description = "C++ Qt API for Libre Graph, a free API for cloud collaboration inspired by the MS Graph API"; homepage = "https://owncloud.org"; - maintainers = with maintainers; [ qknight hellwolf ]; + maintainers = with maintainers; [ hellwolf ]; platforms = platforms.unix; license = licenses.asl20; changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${version}";