Merge pull request #222928 from jtojnar/qt-nowarn

This commit is contained in:
Artturi 2023-03-24 21:10:13 +02:00 committed by GitHub
commit acbebaeeeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -23171,6 +23171,7 @@ with pkgs;
bison cups dconf harfbuzz libGL perl gtk3 python3
darwin buildPackages;
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
inherit config;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
});