qt6.qttranslations: bootstrap directly
This fixes pkgsCross.aarch64-multiplatform.pkgsBuildHost.qt6.qttranslations
This commit is contained in:
@@ -159,7 +159,12 @@ let
|
||||
qtsvg = callPackage ./modules/qtsvg.nix { };
|
||||
qtscxml = callPackage ./modules/qtscxml.nix { };
|
||||
qttools = callPackage ./modules/qttools { };
|
||||
qttranslations = callPackage ./modules/qttranslations.nix { };
|
||||
qttranslations = callPackage ./modules/qttranslations.nix {
|
||||
qttools = self.qttools.override {
|
||||
qtbase = self.qtbase.override { qttranslations = null; };
|
||||
qtdeclarative = null;
|
||||
};
|
||||
};
|
||||
qtvirtualkeyboard = callPackage ./modules/qtvirtualkeyboard.nix { };
|
||||
qtwayland = callPackage ./modules/qtwayland.nix { };
|
||||
qtwebchannel = callPackage ./modules/qtwebchannel.nix { };
|
||||
@@ -215,18 +220,5 @@ let
|
||||
otherSplices = generateSplicesForMkScope "qt6";
|
||||
f = addPackages;
|
||||
};
|
||||
|
||||
bootstrapScope = baseScope.overrideScope (
|
||||
final: prev: {
|
||||
qtbase = prev.qtbase.override { qttranslations = null; };
|
||||
qtdeclarative = null;
|
||||
}
|
||||
);
|
||||
|
||||
finalScope = baseScope.overrideScope (
|
||||
final: prev: {
|
||||
qttranslations = bootstrapScope.qttranslations;
|
||||
}
|
||||
);
|
||||
in
|
||||
finalScope
|
||||
baseScope
|
||||
|
||||
Reference in New Issue
Block a user