diff options
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 8560779b8d030..46a60f5403f48 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -18,6 +18,7 @@ Check for any minor version changes. , developerBuild ? false , decryptSslTraffic ? false , debug ? false +, config }: let @@ -119,9 +120,6 @@ let callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { - # remove before 23.11 - overrideScope' = lib.warn "qt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; - inherit callPackage qtCompatVersion qtModule srcs; mkDerivationWith = @@ -226,6 +224,9 @@ let propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; + } // lib.optionalAttrs config.allowAliases { + # remove before 23.11 + overrideScope' = lib.warn "qt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; }; in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages |