diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix deleted file mode 100644 index 49a105281e05..000000000000 --- a/pkgs/development/libraries/qwlroots/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - wrapQtAppsHook, - wayland-scanner, - qtbase, - wayland, - wayland-protocols, - wlr-protocols, - pixman, - libgbm, - vulkan-loader, - libinput, - libxcb-errors, - libxdmcp, - seatd, - wlroots, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "qwlroots"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "vioken"; - repo = "qwlroots"; - rev = finalAttrs.version; - hash = "sha256-ZyG0JGUlz/ubtwN5wYtC8qeYsPur+0kTkD7iIjHX7KU="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wayland-scanner - ]; - - buildInputs = [ - qtbase - wayland - wayland-protocols - wlr-protocols - pixman - libgbm - vulkan-loader - libinput - libxdmcp - libxcb-errors - seatd - ]; - - propagatedBuildInputs = [ - wlroots - ]; - - cmakeFlags = [ - (lib.cmakeBool "PREFER_QT_5" (lib.versionOlder qtbase.version "6")) - ]; - - dontWrapQtApps = true; - - meta = { - description = "Qt and QML bindings for wlroots"; - homepage = "https://github.com/vioken/qwlroots"; - license = with lib.licenses; [ - gpl3Only - lgpl3Only - asl20 - ]; - platforms = wlroots.meta.platforms; - maintainers = with lib.maintainers; [ wineee ]; - }; -}) diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix deleted file mode 100644 index b6cb99025d64..000000000000 --- a/pkgs/development/libraries/waylib/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - wayland-scanner, - wrapQtAppsHook, - qtbase, - qtdeclarative, - qwlroots, - wayland, - wayland-protocols, - wlr-protocols, - pixman, - libdrm, - libinput, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "waylib"; - version = "0.6.14"; - - src = fetchFromGitHub { - owner = "vioken"; - repo = "waylib"; - rev = finalAttrs.version; - hash = "sha256-Yp7j1L+b41pmLWhxYN4M9W8OjXA31za3Ufp/iE3U/vM="; - }; - - depsBuildBuild = [ - # To find wayland-scanner - pkg-config - ]; - - nativeBuildInputs = [ - cmake - pkg-config - wayland-scanner - ]; - - buildInputs = [ - qtbase - qtdeclarative - qwlroots - wayland - wayland-protocols - wlr-protocols - pixman - libdrm - libinput - ]; - - strictDeps = true; - - dontWrapQtApps = true; - - outputs = [ - "out" - "dev" - ]; - - meta = { - description = "Wrapper for wlroots based on Qt"; - homepage = "https://github.com/vioken/waylib"; - license = with lib.licenses; [ - gpl3Only - lgpl3Only - asl20 - ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ wineee ]; - }; -}) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index d424a7168b75..8350bfd1317e 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -126,10 +126,6 @@ makeScopeWithSplicing' { qtspell = callPackage ../development/libraries/qtspell { }; - qwlroots = callPackage ../development/libraries/qwlroots { - wlroots = pkgs.wlroots_0_18; - }; - qwt = callPackage ../development/libraries/qwt/default.nix { }; qxlsx = callPackage ../development/libraries/qxlsx { }; @@ -157,9 +153,17 @@ makeScopeWithSplicing' { timed = callPackage ../applications/system/timed { }; - waylib = callPackage ../development/libraries/waylib { }; - wayqt = callPackage ../development/libraries/wayqt { }; } + // lib.optionalAttrs config.allowAliases { + qwlroots = throw '' + 'qt6Packages.qwlroots' has been removed because it has been merged into treeland upstream. + The upstream no longer provides it as a standalone development library. + ''; # Added 2025-02-07 + waylib = throw '' + 'qt6Packages.waylib' has been removed because it has been merged into treeland upstream. + The upstream no longer provides it as a standalone development library. + ''; # Added 2025-02-07 + } ); }