diff options
author | Miao, ZhiCheng <zhicheng.miao@gmail.com> | 2023-10-26 23:46:39 +0300 |
---|---|---|
committer | Miao, ZhiCheng <zhicheng.miao@gmail.com> | 2023-10-28 12:07:42 +0300 |
commit | ae102bbaac9ce4d109424bbfa7bb23483358390b (patch) | |
tree | 1b4b7e86990735f7df1aef60d3d77f784fcc72ee /pkgs | |
parent | 0c1b3cb64aeb0463efe0473e116c1846ceeb7a95 (diff) | |
download | nixlib-ae102bbaac9ce4d109424bbfa7bb23483358390b.tar nixlib-ae102bbaac9ce4d109424bbfa7bb23483358390b.tar.gz nixlib-ae102bbaac9ce4d109424bbfa7bb23483358390b.tar.bz2 nixlib-ae102bbaac9ce4d109424bbfa7bb23483358390b.tar.lz nixlib-ae102bbaac9ce4d109424bbfa7bb23483358390b.tar.xz nixlib-ae102bbaac9ce4d109424bbfa7bb23483358390b.tar.zst nixlib-ae102bbaac9ce4d109424bbfa7bb23483358390b.zip |
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
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/by-name/ow/owncloud-client/package.nix (renamed from pkgs/applications/networking/owncloud-client/default.nix) | 42 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 26 insertions, 18 deletions
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/by-name/ow/owncloud-client/package.nix index 7da1a368d845..5edbd5d0f6b8 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/by-name/ow/owncloud-client/package.nix @@ -1,38 +1,49 @@ { 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}"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 235d9fe41ed6..75375824d102 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |