mirror of
https://github.com/celesrenata/end-4-flakes.git
synced 2026-06-29 04:07:31 -05:00
Use prev.quickshell to avoid Qt version mismatch
This commit is contained in:
@@ -24,19 +24,12 @@
|
|||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
overlays.default = final: prev:
|
overlays.default = final: prev: {
|
||||||
let
|
# Use quickshell from the same nixpkgs (supports all architectures)
|
||||||
# Get quickshell from nixpkgs for the current system
|
quickshell-base = prev.quickshell or (builtins.throw "quickshell not available in nixpkgs");
|
||||||
pkgsForQuickshell = import nixpkgs {
|
|
||||||
system = final.system;
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
# Use quickshell from nixpkgs (supports all architectures)
|
|
||||||
quickshell-base = pkgsForQuickshell.quickshell;
|
|
||||||
|
|
||||||
# Enhanced quickshell with Qt5Compat support for dots-hyprland
|
# Enhanced quickshell with Qt5Compat support for dots-hyprland
|
||||||
quickshell = final.writeShellScriptBin "quickshell" ''
|
quickshell = final.writeShellScriptBin "quickshell" ''
|
||||||
# Add Qt5Compat, QtPositioning, and quickshell config directories to QML import path
|
# Add Qt5Compat, QtPositioning, and quickshell config directories to QML import path
|
||||||
export QML2_IMPORT_PATH="${final.kdePackages.qt5compat}/lib/qt-6/qml:${final.kdePackages.qtpositioning}/lib/qt-6/qml:${final.kdePackages.qtlocation}/lib/qt-6/qml:$HOME/.config/quickshell/ii:$HOME/.config/quickshell:$QML2_IMPORT_PATH"
|
export QML2_IMPORT_PATH="${final.kdePackages.qt5compat}/lib/qt-6/qml:${final.kdePackages.qtpositioning}/lib/qt-6/qml:${final.kdePackages.qtlocation}/lib/qt-6/qml:$HOME/.config/quickshell/ii:$HOME/.config/quickshell:$QML2_IMPORT_PATH"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user