From 38f9269c816b24d85f45364162cfb559e8ae0ca3 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 1 Nov 2024 17:46:25 +0100 Subject: [PATCH] qt6: Attempt to provide override attribute --- overlay/modern-minimal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlay/modern-minimal.nix b/overlay/modern-minimal.nix index 46d78d7..bf0b6e1 100644 --- a/overlay/modern-minimal.nix +++ b/overlay/modern-minimal.nix @@ -314,7 +314,7 @@ in genAttrs [ }; }); - qt6 = prev.qt6.overrideScope (final: prev: { + qt6 = final.lib.makeOverridable ({ ... }@args: (prev.qt6.override args).overrideScope (final: prev: { qtbase = (prev.qtbase.overrideAttrs (prevAttrs: { buildInputs = prevAttrs.buildInputs or [ ] |> removePackages [ "libX.*" "libxcb" "xcb.*" ]; @@ -338,7 +338,7 @@ in genAttrs [ [ "-DGL_RGBA8_OES=0x8058" ] |> toString; }; }); - }); + })) { }; systemd = prev.systemd.override { withApparmor = false;