2
0
mirror of https://github.com/m-labs/artiq.git synced 2024-12-26 03:38:25 +08:00

flake: clean up qt paths

This commit is contained in:
Charlie Root 2024-12-11 16:11:59 +01:00 committed by Sébastien Bourdeauducq
parent 2508ff4812
commit 67dde30625

View File

@ -49,9 +49,12 @@
artiqVersion = (builtins.toString artiqVersionMajor) + "." + (builtins.toString artiqVersionMinor) + "+" + artiqVersionId + ".beta";
artiqRev = self.sourceInfo.rev or "unknown";
qtPaths = {
QT_PLUGIN_PATH = "${pkgs.qt6.qtbase}/${pkgs.qt6.qtbase.dev.qtPluginPrefix}:${pkgs.qt6.qtsvg}/${pkgs.qt6.qtbase.dev.qtPluginPrefix}";
QML2_IMPORT_PATH = "${pkgs.qt6.qtbase}/${pkgs.qt6.qtbase.dev.qtQmlPrefix}";
qtPaths = let
inherit (pkgs.qt6) qtbase qtsvg;
inherit (qtbase.dev) qtPluginPrefix qtQmlPrefix;
in {
QT_PLUGIN_PATH = "${qtbase}/${qtPluginPrefix}:${qtsvg}/${qtPluginPrefix}";
QML2_IMPORT_PATH = "${qtbase}/${qtQmlPrefix}";
};
rust = pkgs.rust-bin.nightly."2021-09-01".default.override {