colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accounts-qt, signond: add Qt6 support

Browse Source
This commit is contained in:
K900 2024-02-22 12:41:41 +03:00
parent 416c9181cd
commit 65ae5aa8d8
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/accounts-qt/default.nix
View File

@ -1,14 +1,15 @@
{ stdenv, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "accounts-qt";
version = "1.16";
version = "1.16-unstable-2023-11-24";
# pinned to fork with Qt6 support
src = fetchFromGitLab {
sha256 = "1vmpjvysm0ld8dqnx8msa15hlhrkny02cqycsh4k2azrnijg0xjz";
rev = "VERSION_${version}";
owner = "nicolasfella";
repo = "libaccounts-qt";
owner = "accounts-sso";
rev = "18557f7def9af8f4a9e0e93e9f575ae11e5066aa";
hash = "sha256-8FGZmg2ljSh1DYZfklMTrWN7Sdlk/Atw0qfpbb+GaBc=";
};
propagatedBuildInputs = [ glib libaccounts-glib ];

13
pkgs/development/libraries/signond/default.nix
View File

@ -1,14 +1,15 @@
{ stdenv, lib, fetchFromGitLab, qmake, qtbase, wrapQtAppsHook, doxygen }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "signond";
version = "8.61";
version = "8.61-unstable-2023-11-24";
# pinned to fork with Qt6 support
src = fetchFromGitLab {
owner = "accounts-sso";
repo = pname;
rev = "VERSION_${version}";
sha256 = "sha256-d7JZmGpjIvSN9l1nvKbBZjF0OR5L5frPTGHF/pNEqHE=";
owner = "nicolasfella";
repo = "signond";
rev = "c8ad98249af541514ff7a81634d3295e712f1a39";
hash = "sha256-0FcSVF6cPuFEU9h7JIbanoosW/B4rQhFPOq7iBaOdKw=";
};
nativeBuildInputs = [

3
pkgs/top-level/qt6-packages.nix
View File

@ -29,6 +29,7 @@ makeScopeWithSplicing' {
inherit stdenv;
# LIBRARIES
accounts-qt = callPackage ../development/libraries/accounts-qt { };
appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };
kdsoap = callPackage ../development/libraries/kdsoap { };
@ -91,6 +92,8 @@ makeScopeWithSplicing' {
# is, to allow users to choose the right build if needed.
sddm = callPackage ../applications/display-managers/sddm {};
signond = callPackage ../development/libraries/signond {};
waylib = callPackage ../development/libraries/waylib { };
wayqt = callPackage ../development/libraries/wayqt { };