From dba4342b23fc7c5699108bcb5769c748e7ff2543 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sat, 3 May 2025 16:04:01 +0300 Subject: [PATCH] qt6.qttranslations: bootstrap directly This fixes pkgsCross.aarch64-multiplatform.pkgsBuildHost.qt6.qttranslations --- pkgs/development/libraries/qt-6/default.nix | 22 +++++++-------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 578137a3f3ec..c3f084efbced 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -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