mirror of
https://github.com/m-labs/artiq.git
synced 2024-12-27 04:08:27 +08:00
flake: clean up qt paths
This commit is contained in:
parent
2508ff4812
commit
67dde30625
@ -49,9 +49,12 @@
|
|||||||
artiqVersion = (builtins.toString artiqVersionMajor) + "." + (builtins.toString artiqVersionMinor) + "+" + artiqVersionId + ".beta";
|
artiqVersion = (builtins.toString artiqVersionMajor) + "." + (builtins.toString artiqVersionMinor) + "+" + artiqVersionId + ".beta";
|
||||||
artiqRev = self.sourceInfo.rev or "unknown";
|
artiqRev = self.sourceInfo.rev or "unknown";
|
||||||
|
|
||||||
qtPaths = {
|
qtPaths = let
|
||||||
QT_PLUGIN_PATH = "${pkgs.qt6.qtbase}/${pkgs.qt6.qtbase.dev.qtPluginPrefix}:${pkgs.qt6.qtsvg}/${pkgs.qt6.qtbase.dev.qtPluginPrefix}";
|
inherit (pkgs.qt6) qtbase qtsvg;
|
||||||
QML2_IMPORT_PATH = "${pkgs.qt6.qtbase}/${pkgs.qt6.qtbase.dev.qtQmlPrefix}";
|
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 {
|
rust = pkgs.rust-bin.nightly."2021-09-01".default.override {
|
||||||
|
Loading…
Reference in New Issue
Block a user