albert: move to by-name

This commit is contained in:
eljamm 2024-09-08 18:00:36 +01:00
parent f056d3b4de
commit 6c09f62df7
No known key found for this signature in database
GPG Key ID: 7630FDF7C8FB1F3F
2 changed files with 9 additions and 18 deletions

View File

@ -2,19 +2,12 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
qt6,
cmake, cmake,
libqalculate, libqalculate,
muparser, muparser,
libarchive, libarchive,
python3Packages, python3Packages,
qtbase,
qtscxml,
qtsvg,
qtdeclarative,
qtwayland,
qt5compat,
qttools,
wrapQtAppsHook,
nix-update-script, nix-update-script,
pkg-config, pkg-config,
}: }:
@ -34,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
wrapQtAppsHook qt6.wrapQtAppsHook
]; ];
buildInputs = buildInputs =
@ -42,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
libqalculate libqalculate
libarchive libarchive
muparser muparser
qtbase qt6.qtbase
qtscxml qt6.qtscxml
qtsvg qt6.qtsvg
qtdeclarative qt6.qtdeclarative
qtwayland qt6.qtwayland
qt5compat qt6.qt5compat
qttools qt6.qttools
] ]
++ (with python3Packages; [ ++ (with python3Packages; [
python python

View File

@ -1623,8 +1623,6 @@ with pkgs;
inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { })) inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { }))
akku akkuPackages; akku akkuPackages;
albert = qt6Packages.callPackage ../applications/misc/albert { };
alice-lg = callPackage ../servers/alice-lg{ }; alice-lg = callPackage ../servers/alice-lg{ };
alice-tools = callPackage ../tools/games/alice-tools { alice-tools = callPackage ../tools/games/alice-tools {