From 5c964287288ae617dadc3cf7ef87a1e0c96bf3b8 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 23:35:46 -0800 Subject: [PATCH] python-qt: hit it in the head with a hammer --- pkgs/top-level/all-packages.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0c2668fa795..273ff82d26e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24619,9 +24619,15 @@ with pkgs; pylode = callPackage ../misc/pylode { }; - python-qt = disable-warnings-if-gcc13 (callPackage ../development/libraries/python-qt { + python-qt = (callPackage ../development/libraries/python-qt { python = python3; - inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; + inherit (builtins.mapAttrs (_: pkg: pkg.override (previousArgs: lib.optionalAttrs (previousArgs ? stdenv) { stdenv = gcc12Stdenv; })) qt5) + qmake qttools qtwebengine qtxmlpatterns; + stdenv = gcc12Stdenv; + }) + .overrideAttrs(previousAttrs: { + NIX_CFLAGS_COMPILE = "-w"; + meta = previousAttrs.meta // { broken = true; }; }); pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; @@ -25636,6 +25642,7 @@ with pkgs; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK32; + stdenv = gcc12Stdenv; }; wtk = callPackage ../development/libraries/wtk { };