Skip to content

Commit b28a8f0

Browse files
authored
qt6Packages.{waylib,qwlroots}: drop (NixOS#487841)
2 parents ee9d99c + f43a2aa commit b28a8f0

3 files changed

Lines changed: 10 additions & 155 deletions

File tree

pkgs/development/libraries/qwlroots/default.nix

Lines changed: 0 additions & 75 deletions
This file was deleted.

pkgs/development/libraries/waylib/default.nix

Lines changed: 0 additions & 74 deletions
This file was deleted.

pkgs/top-level/qt6-packages.nix

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ makeScopeWithSplicing' {
126126

127127
qtspell = callPackage ../development/libraries/qtspell { };
128128

129-
qwlroots = callPackage ../development/libraries/qwlroots {
130-
wlroots = pkgs.wlroots_0_18;
131-
};
132-
133129
qwt = callPackage ../development/libraries/qwt/default.nix { };
134130

135131
qxlsx = callPackage ../development/libraries/qxlsx { };
@@ -157,9 +153,17 @@ makeScopeWithSplicing' {
157153

158154
timed = callPackage ../applications/system/timed { };
159155

160-
waylib = callPackage ../development/libraries/waylib { };
161-
162156
wayqt = callPackage ../development/libraries/wayqt { };
163157
}
158+
// lib.optionalAttrs config.allowAliases {
159+
qwlroots = throw ''
160+
'qt6Packages.qwlroots' has been removed because it has been merged into treeland upstream.
161+
The upstream no longer provides it as a standalone development library.
162+
''; # Added 2025-02-07
163+
waylib = throw ''
164+
'qt6Packages.waylib' has been removed because it has been merged into treeland upstream.
165+
The upstream no longer provides it as a standalone development library.
166+
''; # Added 2025-02-07
167+
}
164168
);
165169
}

0 commit comments

Comments
 (0)