Resolve correctly the three-way merge between https://github.com/NixOS/nixpkgs/pull/251681, https://github.com/NixOS/nixpkgs/pull/227900, and https://github.com/NixOS/nixpkgs/pull/246022 |
||
---|---|---|
.. | ||
qtbase.patch.d | ||
default.nix | ||
fetch.sh | ||
modules | ||
qtdeclarative-default-disable-qmlcache.patch | ||
qtdeclarative.patch | ||
qtscript.patch | ||
qtserialport.patch | ||
qttools.patch | ||
qtwebengine-darwin-checks.patch | ||
qtwebengine-darwin-no-platform-check.patch | ||
qtwebengine-link-pulseaudio.patch | ||
qtwebengine-mac-dont-set-dsymutil-path.patch | ||
qtwebkit-darwin-no-qos-classes.patch | ||
qtwebkit-darwin-no-readline.patch | ||
qtwebkit-icu68.patch | ||
qtwebkit.patch | ||
srcs-generated.json | ||
srcs.nix |