BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qt5: use makeScopeWithSplicing

Browse source 
if there is more than one qt5 attr and this file is copied then the arg
to generateSplicesForMkScope should be changed
This commit is contained in:
Artturin 2023-03-09 20:57:06 +02:00
parent 7d8b42a553
commit 2cbbef006b
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/config/no-x-libs.nix
View file

@ -61,7 +61,7 @@ with lib;
pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };
qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });
qt5 = super.qt5.overrideScope' (const (super': { qt5 = super.qt5.overrideScope (const (super': {
qtbase = super'.qtbase.override { withGtk3 = false; }; qtbase = super'.qtbase.override { withGtk3 = false; };
})); }));
stoken = super.stoken.override { withGTK3 = false; }; stoken = super.stoken.override { withGTK3 = false; };

7
pkgs/development/libraries/qt-5/5.15/default.nix
View file

@ -7,7 +7,7 @@ Check for any minor version changes.
*/ */
{ newScope { makeScopeWithSplicing, generateSplicesForMkScope
, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl, python3 , bison, cups ? null, harfbuzz, libGL, perl, python3
, gstreamer, gst-plugins-base, gtk3, dconf , gstreamer, gst-plugins-base, gtk3, dconf
@ -119,6 +119,9 @@ let
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; };
in { 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; inherit callPackage qtCompatVersion qtModule srcs;
mkDerivationWith = mkDerivationWith =
@ -225,4 +228,4 @@ let
} ../hooks/wrap-qt-apps-hook.sh; } ../hooks/wrap-qt-apps-hook.sh;
}; };
in lib.makeScope newScope addPackages in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages

2
pkgs/top-level/all-packages.nix
View file

@ -23072,7 +23072,7 @@ with pkgs;
# TODO: remove once no package needs this anymore or together with OpenSSL 1.1 # TODO: remove once no package needs this anymore or together with OpenSSL 1.1
# Current users: mumble, murmur # Current users: mumble, murmur
qt5_openssl_1_1 = qt5.overrideScope' (_: super: { qt5_openssl_1_1 = qt5.overrideScope (_: super: {
qtbase = super.qtbase.override { qtbase = super.qtbase.override {
openssl = openssl_1_1; openssl = openssl_1_1;
libmysqlclient = libmysqlclient.override { libmysqlclient = libmysqlclient.override {