Skip to content

Commit 8588b15

Browse files
authored
albert: move to pkgs/by-name (#340556)
2 parents b4390ce + 6c09f62 commit 8588b15

File tree

2 files changed

+9
-18
lines changed

2 files changed

+9
-18
lines changed

pkgs/applications/misc/albert/default.nix renamed to pkgs/by-name/al/albert/package.nix

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,12 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5+
qt6,
56
cmake,
67
libqalculate,
78
muparser,
89
libarchive,
910
python3Packages,
10-
qtbase,
11-
qtscxml,
12-
qtsvg,
13-
qtdeclarative,
14-
qtwayland,
15-
qt5compat,
16-
qttools,
17-
wrapQtAppsHook,
1811
nix-update-script,
1912
pkg-config,
2013
}:
@@ -34,21 +27,21 @@ stdenv.mkDerivation (finalAttrs: {
3427
nativeBuildInputs = [
3528
cmake
3629
pkg-config
37-
wrapQtAppsHook
30+
qt6.wrapQtAppsHook
3831
];
3932

4033
buildInputs =
4134
[
4235
libqalculate
4336
libarchive
4437
muparser
45-
qtbase
46-
qtscxml
47-
qtsvg
48-
qtdeclarative
49-
qtwayland
50-
qt5compat
51-
qttools
38+
qt6.qtbase
39+
qt6.qtscxml
40+
qt6.qtsvg
41+
qt6.qtdeclarative
42+
qt6.qtwayland
43+
qt6.qt5compat
44+
qt6.qttools
5245
]
5346
++ (with python3Packages; [
5447
python

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,8 +1623,6 @@ with pkgs;
16231623
inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { }))
16241624
akku akkuPackages;
16251625

1626-
albert = qt6Packages.callPackage ../applications/misc/albert { };
1627-
16281626
alice-lg = callPackage ../servers/alice-lg{ };
16291627

16301628
alice-tools = callPackage ../tools/games/alice-tools {

0 commit comments

Comments
 (0)