various: migrate kdePackages to by-name (#448571)
This commit is contained in:
+7
-12
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
makeBinaryWrapper,
|
||||
zlib,
|
||||
boost,
|
||||
@@ -11,14 +10,7 @@
|
||||
elfutils,
|
||||
sparsehash,
|
||||
zstd,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
kio,
|
||||
kitemmodels,
|
||||
threadweaver,
|
||||
kconfigwidgets,
|
||||
kcoreaddons,
|
||||
kdiagram,
|
||||
kdePackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -35,9 +27,9 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
kdePackages.extra-cmake-modules
|
||||
makeBinaryWrapper
|
||||
wrapQtAppsHook
|
||||
kdePackages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -46,6 +38,8 @@ stdenv.mkDerivation {
|
||||
libunwind
|
||||
sparsehash
|
||||
zstd
|
||||
]
|
||||
++ (with kdePackages; [
|
||||
qtbase
|
||||
kio
|
||||
kitemmodels
|
||||
@@ -53,7 +47,8 @@ stdenv.mkDerivation {
|
||||
kconfigwidgets
|
||||
kcoreaddons
|
||||
kdiagram
|
||||
]
|
||||
])
|
||||
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
elfutils
|
||||
];
|
||||
+3
-7
@@ -1,14 +1,10 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qttools,
|
||||
fio,
|
||||
cmake,
|
||||
polkit-qt-1,
|
||||
extra-cmake-modules,
|
||||
fetchFromGitHub,
|
||||
kdePackages,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kdiskmark";
|
||||
@@ -22,13 +18,13 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with kdePackages; [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = with kdePackages; [
|
||||
qtbase
|
||||
qttools
|
||||
polkit-qt-1
|
||||
+3
-18
@@ -1,28 +1,13 @@
|
||||
{
|
||||
buildGo124Module,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
go_1_24,
|
||||
kconfig,
|
||||
kcoreaddons,
|
||||
kdbusaddons,
|
||||
kguiaddons,
|
||||
ki18n,
|
||||
kirigami,
|
||||
kirigami-addons,
|
||||
knotifications,
|
||||
kwindowsystem,
|
||||
lib,
|
||||
nlohmann_json,
|
||||
qqc2-desktop-style,
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
qtsvg,
|
||||
qtwayland,
|
||||
stdenv,
|
||||
wrapQtAppsHook,
|
||||
kdePackages,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -61,7 +46,7 @@ stdenv.mkDerivation {
|
||||
"-DKTAILCTL_FLATPAK_BUILD=ON"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with kdePackages; [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
git
|
||||
@@ -69,7 +54,7 @@ stdenv.mkDerivation {
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = with kdePackages; [
|
||||
kconfig
|
||||
kcoreaddons
|
||||
kdbusaddons
|
||||
@@ -3,30 +3,12 @@
|
||||
lib,
|
||||
fetchurl,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
pkg-config,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
qtwebengine,
|
||||
grantlee,
|
||||
kxmlgui,
|
||||
kwallet,
|
||||
kparts,
|
||||
kdoctools,
|
||||
kjobwidgets,
|
||||
kiconthemes,
|
||||
knewstuff,
|
||||
sqlcipher,
|
||||
qca,
|
||||
plasma-activities,
|
||||
karchive,
|
||||
kguiaddons,
|
||||
knotifyconfig,
|
||||
krunner,
|
||||
ktexttemplate,
|
||||
kwindowsystem,
|
||||
libofx,
|
||||
shared-mime-info,
|
||||
kdePackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -38,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-HNui/SjCN9LWxUxHDae59n5qPIwYWHX1uFSlVnwBlL8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with kdePackages; [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
kdoctools
|
||||
@@ -47,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = with kdePackages; [
|
||||
qtbase
|
||||
qtwebengine
|
||||
grantlee
|
||||
@@ -3091,8 +3091,6 @@ with pkgs;
|
||||
threadsafe = true;
|
||||
};
|
||||
|
||||
heaptrack = kdePackages.callPackage ../development/tools/profiling/heaptrack { };
|
||||
|
||||
headscale = callPackage ../servers/headscale { };
|
||||
|
||||
highlight = callPackage ../tools/text/highlight {
|
||||
@@ -3237,8 +3235,6 @@ with pkgs;
|
||||
|
||||
kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { };
|
||||
|
||||
kdiskmark = kdePackages.callPackage ../tools/filesystems/kdiskmark { };
|
||||
|
||||
keepkey-agent = with python3Packages; toPythonApplication keepkey-agent;
|
||||
|
||||
keybase = callPackage ../tools/security/keybase { };
|
||||
@@ -3384,8 +3380,6 @@ with pkgs;
|
||||
|
||||
node2nix = nodePackages.node2nix;
|
||||
|
||||
ktailctl = kdePackages.callPackage ../applications/networking/ktailctl { };
|
||||
|
||||
ldapdomaindump = with python3Packages; toPythonApplication ldapdomaindump;
|
||||
|
||||
leanblueprint = with python3Packages; toPythonApplication leanblueprint;
|
||||
@@ -10893,8 +10887,6 @@ with pkgs;
|
||||
|
||||
tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
|
||||
|
||||
whitesur-kde = kdePackages.callPackage ../data/themes/whitesur-kde { };
|
||||
|
||||
xkeyboard_config = xkeyboard-config;
|
||||
|
||||
xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;
|
||||
@@ -12696,8 +12688,6 @@ with pkgs;
|
||||
|
||||
super-slicer-latest = super-slicer.latest;
|
||||
|
||||
skrooge = kdePackages.callPackage ../applications/office/skrooge { };
|
||||
|
||||
soci = callPackage ../development/libraries/soci { };
|
||||
|
||||
socialscan = with python3.pkgs; toPythonApplication socialscan;
|
||||
|
||||
Reference in New Issue
Block a user