From dee73775088d8a81a9bbe970049385c5063c2b80 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Jul 2020 23:52:38 +0200 Subject: [PATCH] qt5.qtwebkit: Fix paths in pc files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In https://github.com/NixOS/nixpkgs/commit/be1b22538a60e52987d238bb11f93043682b6e9a, 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. --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 1133623483affc..12e19af75f0f94 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -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"