Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3b9e9c5ff0cd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 99d25675152f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 12, 2020

  1. qt5: Add missing include path to pkg-config files 

    This is achieved by patching qtbase `qmake/generators/makefile.cpp` to
unconditionally add the missing `-I${includedir}`. The include path is
otherwise conditioned on whether it is already available or not. Since there is
no unified set of system include paths in nix this cause problems as reported
in #52457.
    @xbreak
    xbreak committed May 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veehaitch Vincent Haupert
    GPG key ID: A8B605E96F82B4E4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ee59753 View commit details

Commits on May 28, 2020

  1. Merge pull request #86317 from xbreak/qt5-pkg-config 

    qt5: Add missing include path to pkg-config files
    @ttuegel
    ttuegel authored May 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veehaitch Vincent Haupert
    GPG key ID: A8B605E96F82B4E4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    99d2567 View commit details
Showing with 19 additions and 0 deletions.
  1. +5 −0 pkgs/development/libraries/qt-5/5.12/default.nix
  2. +14 −0 pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0014-qtbase-pkg-config.patch
5 changes: 5 additions & 0 deletions pkgs/development/libraries/qt-5/5.12/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
14 changes: 14 additions & 0 deletions pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0014-qtbase-pkg-config.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -3390,8 +3390,7 @@ MakefileGenerator::writePkgConfigFile()
<< varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ")
// << varGlue("DEFINES","-D"," -D"," ")
;
- if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir))
- t << "-I${includedir}";
+ t << "-I${includedir}";
if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
&& libDir != QLatin1String("/Library/Frameworks")) {
t << " -F${libdir}";