Skip to content

Commit

Permalink
qt5.qtwebkit: Fix paths in pc files
Browse files Browse the repository at this point in the history
In NixOS@be1b225,
CMake setup-hook started to respect setOutputFlags. Since qtModule disables it by default,
cmake no longer received the multiple-output adjusted installation directory flags when
building the qtwebkit package. This resulted in incorrect paths in generated pkg-config files
and CMake config files.

Let’s temporarily enable setOutputFlags in the qtwebkit expression, until the commit is reverted.
  • Loading branch information
jtojnar committed Jul 4, 2020
1 parent ca2b95b commit dee7377
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pkgs/development/libraries/qt-5/modules/qtwebkit.nix
Expand Up @@ -34,6 +34,9 @@ qtModule {
bison flex gdb gperf perl pkgconfig python2 ruby
] ++ optional usingAnnulenWebkitFork cmake;

# Temporary fix for https://github.com/NixOS/nixpkgs/commit/be1b22538a60e52987d238bb11f93043682b6e9a
setOutputFlags = true;

cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ]
++ optionals stdenv.isDarwin [
"-DQt5Multimedia_DIR=${getDev qtmultimedia}/lib/cmake/Qt5Multimedia"
Expand Down

0 comments on commit dee7377

Please sign in to comment.