I expect upstream updates will allow us to drop this override:
|
# [HACK] |
|
# Override cctools `ld` with LLVM's `lld` to avoid Qt 6.11 modules with naive Darwin plugins such as WebKit. |
|
# We patch `python.pkgs.qt6` rather than `pkgs.qt6`, because `overrideScope` on the latter drops its `.override`, |
|
# which `python-packages.nix` calls. |
|
qtLldDarwinOverlay = |
|
final: prev: |
|
lib.optionalAttrs prev.stdenv.hostPlatform.isDarwin { |
|
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ |
|
( |
|
pyFinal: pyPrev: |
|
let |
|
withLld = |
|
drv: |
|
drv.overrideAttrs (old: { |
|
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ final.llvmPackages.lld ]; |
|
env = (old.env or { }) // { |
|
NIX_CFLAGS_LINK = "-fuse-ld=lld"; |
|
}; |
|
}); |
|
in |
|
{ |
|
pyside6 = withLld pyPrev.pyside6; |
|
qt6 = pyPrev.qt6.overrideScope ( |
|
_qtFinal: qtPrev: |
|
lib.genAttrs [ |
|
"qtwebview" |
|
"qtspeech" |
|
"qtconnectivity" |
|
"qtpositioning" |
|
"qtlocation" |
|
] (name: withLld qtPrev.${name}) |
|
); |
|
} |
|
) |
|
]; |
|
}; |
I expect upstream updates will allow us to drop this override:
plover-flake/flake.nix
Lines 40 to 75 in 1a36846