diff options
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.12/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.12/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 124a0459f1391..98dd7a4796114 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -51,7 +51,7 @@ let patches = { qtbase = - optionals stdenv.isDarwin [ + [ ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch ./qtbase.patch.d/0002-qtbase-mac.patch ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch @@ -59,8 +59,7 @@ let # Patch framework detection to support X.framework/X.tbd, # extending the current support for X.framework/X. ./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch - ] - ++ [ + ./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0004-qtbase-replace-libdir.patch ./qtbase.patch.d/0005-qtbase-cmake.patch @@ -97,7 +96,7 @@ let stripLen = 1; extraPrefix = "src/3rdparty/"; }) - ] ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-darwin-fix-failed-static-assertion.patch ]; @@ -108,7 +107,7 @@ let sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) ./qtwebkit.patch - ] ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch ]; |