diff options
| author | Christoph Cullmann <cullmann@kde.org> | 2023-10-08 19:47:42 +0200 |
|---|---|---|
| committer | Christoph Cullmann <cullmann@kde.org> | 2023-10-08 19:47:42 +0200 |
| commit | bbeb99fb4d61dab8d690b0235c8e65dbb206e495 (patch) | |
| tree | 812ff22aa931c67a798d4c3d2423f556652f819c /projects | |
| parent | 05c76b21e9791e0f999e248d38277307f383241d (diff) | |
fixup kde dev env with right clang tools
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/kde6/cleanup.sh | 2 | ||||
| -rw-r--r-- | projects/kde6/shell.nix | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/projects/kde6/cleanup.sh b/projects/kde6/cleanup.sh index a4cb9b0..bb6dc42 100644 --- a/projects/kde6/cleanup.sh +++ b/projects/kde6/cleanup.sh @@ -9,4 +9,4 @@ cd ~/projects/kde6/src || exit 1 git clone https://invent.kde.org/sdk/kdesrc-build.git || exit 1 # start from scratch -exec ./kdesrc-build/kdesrc-build --rc-file=../kdesrc-buildrc --refresh-build --include-dependencies breeze plasma-integration konsole kate +exec ./kdesrc-build/kdesrc-build --rc-file=../kdesrc-buildrc --include-dependencies breeze plasma-integration konsole kate diff --git a/projects/kde6/shell.nix b/projects/kde6/shell.nix index a7801be..216df31 100644 --- a/projects/kde6/shell.nix +++ b/projects/kde6/shell.nix @@ -1,6 +1,11 @@ -{ pkgs ? import <nixpkgs> {} }: +with import <nixpkgs> {}; -pkgs.mkShell { +# use new clang +let myllvm = llvmPackages_16; in + +# clang based dev env +myllvm.stdenv.mkDerivation { + name = "clang-nix-shell"; # ensure the local KDE things are in path shellHook = '' export PATH=/home/cullmann/projects/kde6/usr/bin:/home/cullmann/projects/kde6:/home/cullmann/projects/kde6/src/kdesrc-build:$PATH @@ -22,7 +27,6 @@ export QT_QUICK_CONTROLS_STYLE_PATH=/home/cullmann/projects/kde6/usr/lib/qml/QtQ bison boost bzip2 - clang-tools cmake docbook_xml_dtd_45 docbook_xsl_ns @@ -39,7 +43,6 @@ export QT_QUICK_CONTROLS_STYLE_PATH=/home/cullmann/projects/kde6/usr/lib/qml/QtQ lcms2 libcanberra libcap - libclang.python libdisplay-info libepoxy libgcrypt @@ -62,6 +65,7 @@ export QT_QUICK_CONTROLS_STYLE_PATH=/home/cullmann/projects/kde6/usr/lib/qml/QtQ lmdb mesa meson + myllvm.libclang.python # git-clang-format networkmanager ninja openal |