diff --git a/pkgs/applications/display-managers/greetd/qtgreet.nix b/pkgs/applications/display-managers/greetd/qtgreet.nix new file mode 100644 index 000000000000..dc6d2955ae3e --- /dev/null +++ b/pkgs/applications/display-managers/greetd/qtgreet.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + kdePackages, + qt6, + dfl-ipc, + dfl-utils, + dfl-applications, + dfl-login1, + mpvSupport ? true, + mpv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qtgreet"; + version = "2.0.3.95"; + + src = fetchFromGitLab { + owner = "marcusbritanicus"; + repo = "QtGreet"; + rev = "v${finalAttrs.version}"; + hash = "sha256-5csKvBiffW+yHuNyFqxOE5bcsTWlyoLwFxuPH0WlFAE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + kdePackages.wayqt + qt6.qtbase + dfl-ipc + dfl-utils + dfl-applications + dfl-login1 + ] ++ lib.optionals mpvSupport [ mpv ]; + + mesonFlags = [ + (lib.mesonOption "dynpath" "${placeholder "out"}/var/lib/qtgreet") + ]; + + meta = { + description = "Qt based greeter for greetd, to be run under wayfire or similar wlr-based compositors"; + homepage = "https://gitlab.com/marcusbritanicus/QtGreet"; + changelog = "https://gitlab.com/marcusbritanicus/QtGreet/-/blob/${finalAttrs.src.rev}/Changelog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + mainProgram = "qtgreet"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/df/dfl-applications/package.nix b/pkgs/by-name/df/dfl-applications/package.nix new file mode 100644 index 000000000000..82a1ab286ee1 --- /dev/null +++ b/pkgs/by-name/df/dfl-applications/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + qt6, + dfl-ipc, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dfl-applications"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "applications"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VDkJkrkhjWi61YD7qNQSF9/ctXtvVf+nh/zUVxAAE4Q="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + qt6.qtbase + dfl-ipc + ]; + + dontWrapQtApps = true; + + outputs = [ + "out" + "dev" + ]; + + meta = { + description = "Library provides a thin wrapper around QApplication, QGuiApplication and QCoreApplication"; + homepage = "https://gitlab.com/desktop-frameworks/applications"; + changelog = "https://gitlab.com/desktop-frameworks/applications/-/blob/${finalAttrs.src.rev}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/df/dfl-ipc/package.nix b/pkgs/by-name/df/dfl-ipc/package.nix new file mode 100644 index 000000000000..b1e09c6871c5 --- /dev/null +++ b/pkgs/by-name/df/dfl-ipc/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + qt6, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dfl-ipc"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "ipc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-GjQg7Fq7fWal1vh/jR5qqm+qs+D/McCoQfktOvO86eA="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + buildInputs = [ + qt6.qtbase + ]; + + dontWrapQtApps = true; + + outputs = [ + "out" + "dev" + ]; + + meta = { + description = "A very simple set of IPC classes for inter-process communication"; + homepage = "https://gitlab.com/desktop-frameworks/ipc"; + changelog = "https://gitlab.com/desktop-frameworks/ipc/-/blob/${finalAttrs.src.rev}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/df/dfl-login1/package.nix b/pkgs/by-name/df/dfl-login1/package.nix new file mode 100644 index 000000000000..59984c4d167b --- /dev/null +++ b/pkgs/by-name/df/dfl-login1/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + qt6, + systemd, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dfl-login1"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "login1"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Aw2yg5KH618/lG+BQU8JZhQ/8qr6L3vWiEgUNu7aGYY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + qt6.qtbase + systemd + ]; + + dontWrapQtApps = true; + + outputs = [ + "out" + "dev" + ]; + + meta = { + description = "Implementation of systemd/elogind for DFL"; + homepage = "https://gitlab.com/desktop-frameworks/login1"; + changelog = "https://gitlab.com/desktop-frameworks/login1/-/blob/${finalAttrs.src.rev}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/df/dfl-utils/package.nix b/pkgs/by-name/df/dfl-utils/package.nix new file mode 100644 index 000000000000..f229cf90f84d --- /dev/null +++ b/pkgs/by-name/df/dfl-utils/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + qt6, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dfl-utils"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "utils"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XiOLVx9X2i+IWORde05P2cFulQRU/EQErbyr5fgZDY4="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + buildInputs = [ + qt6.qtbase + ]; + + dontWrapQtApps = true; + + outputs = [ + "out" + "dev" + ]; + + meta = { + description = "Some utilities for DFL"; + homepage = "https://gitlab.com/desktop-frameworks/utils"; + changelog = "https://gitlab.com/desktop-frameworks/utils/-/blob/${finalAttrs.src.rev}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/wayqt/default.nix b/pkgs/development/libraries/wayqt/default.nix index 238e5e8929e2..a8c77cb48252 100644 --- a/pkgs/development/libraries/wayqt/default.nix +++ b/pkgs/development/libraries/wayqt/default.nix @@ -5,7 +5,6 @@ replaceVars, meson, pkg-config, - qttools, ninja, qtbase, qtwayland, @@ -33,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson pkg-config - qttools ninja ]; @@ -43,10 +41,6 @@ stdenv.mkDerivation (finalAttrs: { wayland ]; - mesonFlags = [ - "-Duse_qt_version=qt6" - ]; - dontWrapQtApps = true; outputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 544f5f0355d2..6e852d406904 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14112,6 +14112,7 @@ with pkgs; { greetd = callPackage ../applications/display-managers/greetd { }; gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { }; + qtgreet = callPackage ../applications/display-managers/greetd/qtgreet.nix { }; regreet = callPackage ../applications/display-managers/greetd/regreet.nix { }; tuigreet = callPackage ../applications/display-managers/greetd/tuigreet.nix { }; wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { };