diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-05-28 05:46:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 05:46:52 -0500 |
| commit | 99d25675152f30caf6354db93f01fac87f640c8f (patch) | |
| tree | 18ff590ccf67469dd986715ac9d07792c441cc3a /pkgs/development/libraries/qt-5/5.12/default.nix | |
| parent | 3b9e9c5ff0cd7f655e092f5e8446cc84e9526c41 (diff) | |
| parent | ee5975319b149007a0100f15cc3356d352fb5b1c (diff) | |
| download | nixlib-99d25675152f30caf6354db93f01fac87f640c8f.tar nixlib-99d25675152f30caf6354db93f01fac87f640c8f.tar.gz nixlib-99d25675152f30caf6354db93f01fac87f640c8f.tar.bz2 nixlib-99d25675152f30caf6354db93f01fac87f640c8f.tar.lz nixlib-99d25675152f30caf6354db93f01fac87f640c8f.tar.xz nixlib-99d25675152f30caf6354db93f01fac87f640c8f.tar.zst nixlib-99d25675152f30caf6354db93f01fac87f640c8f.zip | |
Merge pull request #86317 from xbreak/qt5-pkg-config
qt5: Add missing include path to pkg-config files
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.12/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.12/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index afca6c7969b4..bdefca45a9af 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -67,6 +67,11 @@ let ./qtbase.patch.d/0010-qtbase-qtpluginpath.patch ./qtbase.patch.d/0011-qtbase-assert.patch ./qtbase.patch.d/0012-fix-header_module.patch + + # Ensure -I${includedir} is added to Cflags in pkg-config files. + # See https://github.com/NixOS/nixpkgs/issues/52457 + ./qtbase.patch.d/0014-qtbase-pkg-config.patch + # https://bugreports.qt.io/browse/QTBUG-81715 # remove after updating to qt > 5.12.7 (fetchpatch { |