summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkgs/applications/networking/instant-messengers/neochat/default.nix41
-rw-r--r--pkgs/development/libraries/KQuickImageEdit/default.nix22
-rw-r--r--pkgs/top-level/all-packages.nix4
3 files changed, 67 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix
new file mode 100644
index 000000000000..141b887ef9b4
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix
@@ -0,0 +1,41 @@
+{ mkDerivation, stdenv, fetchFromGitLab
+, pkgconfig, wrapQtAppsHook
+, cmake
+, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain
+, libpulseaudio
+# Not mentioned but seems needed
+, qtgraphicaleffects
+, qtdeclarative
+, qtmacextras
+, olm, libsecret, cmark, extra-cmake-modules, kirigami2, ki18n, knotifications, kdbusaddons, kconfig, libquotient
+, KQuickImageEdit, kitemmodels
+}:
+
+let
+qtkeychain-qt5 = qtkeychain.override {
+ inherit qtbase qttools;
+ withQt5 = true;
+};
+
+in mkDerivation rec {
+ pname = "neochat";
+ version = "v1.0";
+
+ src = fetchFromGitLab {
+ domain = "invent.kde.org";
+ owner = "network";
+ repo = pname;
+ rev = version;
+ sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9";
+ };
+
+ nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules wrapQtAppsHook ];
+ buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark kirigami2 ki18n knotifications kdbusaddons kconfig libquotient KQuickImageEdit kitemmodels libpulseaudio ];
+
+ meta = with stdenv.lib; {
+ description = "A client for matrix, the decentralized communication protocol.";
+ homepage = "https://apps.kde.org/en/neochat";
+ license = licenses.gpl3;
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/development/libraries/KQuickImageEdit/default.nix b/pkgs/development/libraries/KQuickImageEdit/default.nix
new file mode 100644
index 000000000000..a62bf54df642
--- /dev/null
+++ b/pkgs/development/libraries/KQuickImageEdit/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, fetchFromGitLab
+, extra-cmake-modules
+, qtbase
+, qtquickcontrols2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "KQuickImageEditor";
+ version = "0.1";
+
+ src = fetchFromGitLab {
+ domain = "invent.kde.org";
+ owner = "libraries";
+ repo = pname;
+ rev = version;
+ sha256 = "0krx9bq6nfmpjjangis8gaz8rx3z35f6m3cpsrcfdwpgpm22fqll";
+ };
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+ buildInputs = [ qtbase qtquickcontrols2 ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d922b97860a3..65ac1da50306 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5939,6 +5939,8 @@ in
neo-cowsay = callPackage ../tools/misc/neo-cowsay { };
+ neochat = libsForQt5.callPackage ../applications/networking/instant-messengers/neochat { };
+
neofetch = callPackage ../tools/misc/neofetch { };
nerdfonts = callPackage ../data/fonts/nerdfonts { };
@@ -15659,6 +15661,8 @@ in
kreport = callPackage ../development/libraries/kreport { };
+ KQuickImageEdit = callPackage ../development/libraries/KQuickImageEdit { };
+
ldutils = callPackage ../development/libraries/ldutils { };
libcommuni = callPackage ../development/libraries/libcommuni { };