From 2cbbef006b5b48dc9428d3caa99f853fedc6bfe7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 9 Mar 2023 20:57:06 +0200 Subject: qt5: use makeScopeWithSplicing if there is more than one qt5 attr and this file is copied then the arg to generateSplicesForMkScope should be changed --- pkgs/development/libraries/qt-5/5.15/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/qt-5/5.15/default.nix') 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 -- cgit 1.4.1