mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-16 18:53:17 +00:00
Revert "python-qt: hit it in the head with a hammer"
This reverts commit 5c96428728
.
This commit is contained in:
parent
ef13e3abd4
commit
4f7cb34d63
@ -24095,15 +24095,9 @@ with pkgs;
|
|||||||
|
|
||||||
pylode = callPackage ../misc/pylode { };
|
pylode = callPackage ../misc/pylode { };
|
||||||
|
|
||||||
python-qt = (callPackage ../development/libraries/python-qt {
|
python-qt = disable-warnings-if-gcc13 (callPackage ../development/libraries/python-qt {
|
||||||
python = python3;
|
python = python3;
|
||||||
inherit (builtins.mapAttrs (_: pkg: pkg.override (previousArgs: lib.optionalAttrs (previousArgs ? stdenv) { stdenv = gcc12Stdenv; })) qt5)
|
inherit (qt5) qmake qttools qtwebengine qtxmlpatterns;
|
||||||
qmake qttools qtwebengine qtxmlpatterns;
|
|
||||||
stdenv = gcc12Stdenv;
|
|
||||||
})
|
|
||||||
.overrideAttrs(previousAttrs: {
|
|
||||||
NIX_CFLAGS_COMPILE = "-w";
|
|
||||||
meta = previousAttrs.meta // { broken = true; };
|
|
||||||
});
|
});
|
||||||
|
|
||||||
pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { };
|
pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { };
|
||||||
|
Loading…
Reference in New Issue
Block a user