From 7d8b42a553f3fa2f76e1b754b424d1c3c23bd7d0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 9 Mar 2023 20:56:47 +0200 Subject: [PATCH] qt5: inherit from __splicedPackages to fix cross --- pkgs/top-level/all-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fbad823ba93..738e2a75fcca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; });