movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

kaidan: move to by-name and clean-up (#414446)

Browse source
This commit is contained in:
Aleksana 2025-06-09 14:49:01 +08:00 • committed by GitHub
commit ed2f18fd2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

66
pkgs/applications/networking/instant-messengers/kaidan/default.nix → pkgs/by-name/ka/kaidan/package.nix
View file

@ -5,33 +5,21 @@
cmake, cmake,
extra-cmake-modules, extra-cmake-modules,
pkg-config, pkg-config,
wrapQtAppsHook, kdePackages,
qtbase,
qttools,
qtmultimedia,
qtlocation,
qqc2-desktop-style,
kirigami-addons,
kirigami,
kio,
knotifications,
kquickimageedit,
zxing-cpp, zxing-cpp,
qxmpp, qxmpp,
sonnet,
gst_all_1, gst_all_1,
prison,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "kaidan"; pname = "kaidan";
version = "0.11.0"; version = "0.11.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "invent.kde.org"; domain = "invent.kde.org";
owner = "network"; owner = "network";
repo = pname; repo = "kaidan";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-8pC4vINeKSYY+LlVgCXUtBq9UjraPdTikBOwLBLeQ3Y="; hash = "sha256-8pC4vINeKSYY+LlVgCXUtBq9UjraPdTikBOwLBLeQ3Y=";
}; };
@ -39,34 +27,34 @@ stdenv.mkDerivation rec {
cmake cmake
extra-cmake-modules extra-cmake-modules
pkg-config pkg-config
wrapQtAppsHook kdePackages.wrapQtAppsHook
]; ];
buildInputs = with gst_all_1; [ buildInputs = [
qtbase kdePackages.kio
qttools kdePackages.kirigami
qtmultimedia kdePackages.kirigami-addons
qtlocation kdePackages.knotifications
qqc2-desktop-style kdePackages.kquickimageedit
kirigami-addons kdePackages.prison
kirigami kdePackages.qtbase
kio kdePackages.qttools
knotifications kdePackages.qtmultimedia
kquickimageedit kdePackages.qtlocation
kdePackages.qqc2-desktop-style
kdePackages.sonnet
zxing-cpp zxing-cpp
qxmpp qxmpp
sonnet gst_all_1.gstreamer
gstreamer gst_all_1.gst-plugins-bad
gst-plugins-bad gst_all_1.gst-plugins-base
gst-plugins-base (gst_all_1.gst-plugins-good.override { qt6Support = true; })
(gst-plugins-good.override { qt6Support = true; })
prison
]; ];
postInstall = '' postInstall = ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
''; '';
meta = with lib; { meta = {
description = "User-friendly and modern chat app, using XMPP"; description = "User-friendly and modern chat app, using XMPP";
mainProgram = "kaidan"; mainProgram = "kaidan";
longDescription = '' longDescription = ''
@ -79,13 +67,13 @@ stdenv.mkDerivation rec {
messages, and file sharing. messages, and file sharing.
''; '';
homepage = "https://www.kaidan.im"; homepage = "https://www.kaidan.im";
license = with licenses; [ license = with lib.licenses; [
gpl3Plus gpl3Plus
mit mit
asl20 asl20
cc-by-sa-40 cc-by-sa-40
]; ];
maintainers = with maintainers; [ astro ]; maintainers = with lib.maintainers; [ astro ];
platforms = with platforms; linux; platforms = with lib.platforms; linux;
}; };
} })

2
pkgs/top-level/all-packages.nix
View file

@ -12979,8 +12979,6 @@ with pkgs;
kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
kaidan = kdePackages.callPackage ../applications/networking/instant-messengers/kaidan { };
kexi = libsForQt5.callPackage ../applications/office/kexi { }; kexi = libsForQt5.callPackage ../applications/office/kexi { };
kgraphviewer = callPackage ../applications/graphics/kgraphviewer { }; kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };