Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

qt5: inherit from __splicedPackages to fix cross #220374

Merged
merged 2 commits into from
Mar 9, 2023
Merged

qt5: inherit from __splicedPackages to fix cross #220374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d8b42a
qt5: inherit from __splicedPackages to fix cross
Artturin Mar 9, 2023
2cbbef0
qt5: use makeScopeWithSplicing
Artturin Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/config/no-x-libs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ with lib;
pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };
qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = 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; };
}));
stoken = super.stoken.override { withGTK3 = false; };
Expand Down
7 changes: 5 additions & 2 deletions pkgs/development/libraries/qt-5/5.15/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -225,4 +228,4 @@ let
} ../hooks/wrap-qt-apps-hook.sh;
};

in lib.makeScope newScope addPackages
in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages
13 changes: 6 additions & 7 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23058,12 +23058,11 @@ with pkgs;

qt5 = recurseIntoAttrs (makeOverridable
(import ../development/libraries/qt-5/5.15) {
inherit newScope;
inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3 python3;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit darwin;
inherit buildPackages;
inherit (__splicedPackages)
makeScopeWithSplicing generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper
bison cups dconf harfbuzz libGL perl gtk3 python3
darwin buildPackages;
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
});

Expand All @@ -23073,7 +23072,7 @@ with pkgs;

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