diff options
| author | Artturin <Artturin@artturin.com> | 2023-03-09 20:57:06 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-03-09 21:16:03 +0200 |
| commit | 2cbbef006b5b48dc9428d3caa99f853fedc6bfe7 (patch) | |
| tree | 507f3d58a639ac2c4b8e415bcfa50d2cfa0498eb /pkgs/development/libraries/qt-5/5.15/default.nix | |
| parent | 7d8b42a553f3fa2f76e1b754b424d1c3c23bd7d0 (diff) | |
qt5: use makeScopeWithSplicing
if there is more than one qt5 attr and this file is copied then the arg to generateSplicesForMkScope should be changed
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.15/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 31de73b25edcf..8560779b8d030 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -7,7 +7,7 @@ Check for any minor version changes. */ -{ newScope +{ makeScopeWithSplicing, generateSplicesForMkScope , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf @@ -119,6 +119,9 @@ 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 = @@ -225,4 +228,4 @@ let } ../hooks/wrap-qt-apps-hook.sh; }; -in lib.makeScope newScope addPackages +in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages |