diff --git a/projects/kde6/cleanup.sh b/projects/kde/cleanup.sh similarity index 65% rename from projects/kde6/cleanup.sh rename to projects/kde/cleanup.sh index 3494e8c..5efb0a3 100755 --- a/projects/kde6/cleanup.sh +++ b/projects/kde/cleanup.sh @@ -1,11 +1,11 @@ #!/bin/sh # kill all old stuff -rm -rf ~/projects/kde6/src ~/projects/kde6/build ~/projects/kde6/usr || exit 1 +rm -rf ~/projects/kde/src ~/projects/kde/build ~/projects/kde/usr || exit 1 # get new kdesrc-build -mkdir -p ~/projects/kde6/src || exit 1 -cd ~/projects/kde6/src || exit 1 +mkdir -p ~/projects/kde/src || exit 1 +cd ~/projects/kde/src || exit 1 git clone https://invent.kde.org/sdk/kdesrc-build.git || exit 1 # start from scratch diff --git a/projects/kde6/kdesrc-buildrc b/projects/kde/kdesrc-buildrc similarity index 74% rename from projects/kde6/kdesrc-buildrc rename to projects/kde/kdesrc-buildrc index afa11f5..8ddb4c5 100644 --- a/projects/kde6/kdesrc-buildrc +++ b/projects/kde/kdesrc-buildrc @@ -18,15 +18,15 @@ global directory-layout flat # Install directory for KDE software - install-dir ~/projects/kde6/usr + install-dir ~/projects/kde/usr # Directory for downloaded source code - source-dir ~/projects/kde6/src + source-dir ~/projects/kde/src # Directory to build KDE into before installing # relative to source-dir by default - build-dir ~/projects/kde6/build + build-dir ~/projects/kde/build end global -include ~/projects/kde6/src/kdesrc-build/data/build-include/kf6-frameworks.ksb -include ~/projects/kde6/src/kdesrc-build/data/build-include/kf6-applications.ksb +include ~/projects/kde/src/kdesrc-build/data/build-include/kf6-frameworks.ksb +include ~/projects/kde/src/kdesrc-build/data/build-include/kf6-applications.ksb diff --git a/projects/kde6/shell.nix b/projects/kde/shell.nix similarity index 75% rename from projects/kde6/shell.nix rename to projects/kde/shell.nix index 60ec678..8f0e1ba 100644 --- a/projects/kde6/shell.nix +++ b/projects/kde/shell.nix @@ -8,15 +8,15 @@ 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 +export PATH=/home/cullmann/projects/kde/usr/bin:/home/cullmann/projects/kde:/home/cullmann/projects/kde/src/kdesrc-build:$PATH # LD_LIBRARY_PATH only needed if you are building without rpath -# export LD_LIBRARY_PATH=/home/cullmann/projects/kde6/usr/lib:$LD_LIBRARY_PATH +# export LD_LIBRARY_PATH=/home/cullmann/projects/kde/usr/lib:$LD_LIBRARY_PATH -export QT_PLUGIN_PATH=/home/cullmann/projects/kde6/usr/lib/plugins:${pkgs.qt6.qtbase.qtPluginPrefix}:${pkgs.lib.getBin pkgs.qt6.qtsvg}/${pkgs.qt6.qtbase.qtPluginPrefix}:${pkgs.lib.getBin pkgs.qt6.qtwayland}/${pkgs.qt6.qtbase.qtPluginPrefix}:${pkgs.lib.getBin pkgs.qt6.qtspeech}/${pkgs.qt6.qtbase.qtPluginPrefix}:$QT_PLUGIN_PATH -export QML2_IMPORT_PATH=/home/cullmann/projects/kde6/usr/lib/qml:$QML2_IMPORT_PATH +export QT_PLUGIN_PATH=/home/cullmann/projects/kde/usr/lib/plugins:${pkgs.qt6.qtbase.qtPluginPrefix}:${pkgs.lib.getBin pkgs.qt6.qtsvg}/${pkgs.qt6.qtbase.qtPluginPrefix}:${pkgs.lib.getBin pkgs.qt6.qtwayland}/${pkgs.qt6.qtbase.qtPluginPrefix}:${pkgs.lib.getBin pkgs.qt6.qtspeech}/${pkgs.qt6.qtbase.qtPluginPrefix}:$QT_PLUGIN_PATH +export QML2_IMPORT_PATH=/home/cullmann/projects/kde/usr/lib/qml:$QML2_IMPORT_PATH -export QT_QUICK_CONTROLS_STYLE_PATH=/home/cullmann/projects/kde6/usr/lib/qml/QtQuick/Controls.2/:$QT_QUICK_CONTROLS_STYLE_PATH +export QT_QUICK_CONTROLS_STYLE_PATH=/home/cullmann/projects/kde/usr/lib/qml/QtQuick/Controls.2/:$QT_QUICK_CONTROLS_STYLE_PATH ''; # add all needed stuff to have a KDE KF6 Qt6 env