diff options
| author | Christoph Cullmann <cullmann@kde.org> | 2024-03-10 00:28:26 +0100 |
|---|---|---|
| committer | Christoph Cullmann <cullmann@kde.org> | 2024-03-10 00:28:26 +0100 |
| commit | e1da4a78b36238af3ebf5262a912a900123d3d72 (patch) | |
| tree | d872f46c44ed996fd3317202f58920875d22fb26 /projects | |
| parent | 8e3da91aac499e910ae061fbda8e16f7955d3a88 (diff) | |
fix dev setup
Diffstat (limited to 'projects')
| -rwxr-xr-x | projects/kde/cleanup.sh | 5 | ||||
| -rw-r--r-- | projects/kde/kdesrc-buildrc | 4 | ||||
| -rw-r--r-- | projects/kde/shell.nix | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/projects/kde/cleanup.sh b/projects/kde/cleanup.sh index a83c63a..835a7f6 100755 --- a/projects/kde/cleanup.sh +++ b/projects/kde/cleanup.sh @@ -9,9 +9,6 @@ rm -rf ~/projects/kde/src ~/projects/kde/build ~/projects/kde/usr || exit 1 # get new kde-builder mkdir -p ~/projects/kde/src || exit 1 git clone https://invent.kde.org/sdk/kde-builder.git ~/projects/kde/src/kde-builder || exit 1 -git clone https://invent.kde.org/sdk/kdesrc-build.git ~/projects/kde/src/kdesrc-build || exit 1 # start from scratch -exec ./src/kde-builder/kde-builder --rc-file=~/projects/kde/kdesrc-buildrc kguiaddons -# exec ./src/kdesrc-build/kdesrc-build --rc-file=~/projects/kde/kdesrc-buildrc kguiaddons -# exec ./src/kde-builder/kde-builder --rc-file=~/projects/kde/kdesrc-buildrc --include-dependencies breeze plasma-integration kwayland-integration konsole kate +exec ./src/kde-builder/kde-builder --rc-file=~/projects/kde/kdesrc-buildrc --include-dependencies breeze plasma-integration kwayland-integration konsole kate diff --git a/projects/kde/kdesrc-buildrc b/projects/kde/kdesrc-buildrc index bbf002f..4871d1e 100644 --- a/projects/kde/kdesrc-buildrc +++ b/projects/kde/kdesrc-buildrc @@ -2,7 +2,7 @@ global # use the latest KF6 and Qt6-based software. branch-group kf6-qt6 - # we want .kateproject files with ninja + # we want .kateproject files with ninja, turn off some Qt 5 things to have less dependencies cmake-options -G "Kate - Ninja" -DBUILD_WITH_QT6=ON -DQT_MAJOR_VERSION=6 -DPHONON_BUILD_QT5=OFF -DBUILD_QT5=OFF # Restrict make and ninja to using no more than 8 separate compile jobs even @@ -28,7 +28,7 @@ global build-dir ~/projects/kde/build # use distro stuff for that - ignore-modules wayland + ignore-modules wayland wayland-protocols gpgme appstream end global include ${module-definitions-dir}/kf6-qt6.ksb diff --git a/projects/kde/shell.nix b/projects/kde/shell.nix index 3eaa29e..0008ed7 100644 --- a/projects/kde/shell.nix +++ b/projects/kde/shell.nix @@ -27,6 +27,7 @@ export QT_QUICK_CONTROLS_STYLE_PATH=/home/cullmann/projects/kde/usr/lib/qml/QtQu bison boost bzip2 + clang-tools_16 cmake ctags curl |