Unverified Commit ae102bba authored by Miao, ZhiCheng's avatar Miao, ZhiCheng
Browse files

owncloud-client: 4.2.0 -> 5.0.0 

- 5.0.0 adds new a new local dependency: kdsingleapplication
- 5.0.0 starts to use Qt6
- Qt6 requires qt6.qtsvg for tray icon support
- move all packages under by-name
parent 0c1b3cb6

pkgs/applications/networking/owncloud-client/default.nix→pkgs/by-name/ow/owncloud-client/package.nix

+26 −16
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, mkDerivation

, pkg-config

, cmake

, extra-cmake-modules

, callPackage

, qtbase

, qtkeychain

, wrapQtAppsHook

, qttools

, qt6

, qt6Packages

, sqlite

, libsecret

, libre-graph-api-cpp-qt-client

, kdsingleapplication

# darwin only:

, libinotify-kqueue

, sparkleshare

}:



stdenv.mkDerivation rec {

  pname = "owncloud-client";

  version = "4.2.0";



  libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { };

  version = "5.0.0";



  src = fetchFromGitHub {

    owner = "owncloud";

    repo = "client";

    rev = "refs/tags/v${version}";

    hash = "sha256-dPNVp5DxCI4ye8eFjHoLGDlf8Ap682o1UB0k2VNr2rs=";

    hash = "sha256-SSMNmWrCT1sGa38oY8P84QNedNkQPcIRWrV9B65B5X8=";

  };



  nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ];

  buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ];

  nativeBuildInputs = [

    pkg-config

    cmake

    extra-cmake-modules

    qt6.qttools

    qt6.wrapQtAppsHook

  ];



  cmakeFlags = [

    "-UCMAKE_INSTALL_LIBDIR"

    "-DNO_SHIBBOLETH=1"

  buildInputs = [

    sqlite

    libsecret

    qt6.qtbase

    qt6.qtsvg # Needed for the systray icon

    qt6Packages.qtkeychain

    libre-graph-api-cpp-qt-client

    kdsingleapplication

  ] ++ lib.optionals stdenv.isDarwin [

    libinotify-kqueue sparkleshare

  ];



  meta = with lib; {
@@ -40,7 +51,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://owncloud.org";

    maintainers = with maintainers; [ qknight hellwolf ];

    platforms = platforms.unix;

    broken = stdenv.isDarwin;

    license = licenses.gpl2Plus;

    changelog = "https://github.com/owncloud/client/releases/tag/v${version}";

  };

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -11791,8 +11791,6 @@ with pkgs; 
    inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration;

  };













  owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { };



























  oxefmsynth = callPackage ../applications/audio/oxefmsynth { };





























  oxidized = callPackage ../tools/admin/oxidized { };