diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-02-27 00:05:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 00:05:56 +0100 |
| commit | b4cf3f79092475a332136eab55d48ce613b3e043 (patch) | |
| tree | f324802aa7595c7e2b62280baccf3d6745a098f4 /pkgs | |
| parent | 6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56 (diff) | |
| parent | a98a767695765a263e0da0f35033fe21950feefe (diff) | |
| download | nixpkgs-b4cf3f79092475a332136eab55d48ce613b3e043.tar nixpkgs-b4cf3f79092475a332136eab55d48ce613b3e043.tar.gz nixpkgs-b4cf3f79092475a332136eab55d48ce613b3e043.tar.bz2 nixpkgs-b4cf3f79092475a332136eab55d48ce613b3e043.tar.lz nixpkgs-b4cf3f79092475a332136eab55d48ce613b3e043.tar.xz nixpkgs-b4cf3f79092475a332136eab55d48ce613b3e043.tar.zst nixpkgs-b4cf3f79092475a332136eab55d48ce613b3e043.zip | |
Merge pull request #35349 from matthewbauer/qt5-darwin-pkgconfig
qt5: install pkg_config files on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.10/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix index eeff3456833..63d50c19a19 100644 --- a/pkgs/development/libraries/qt-5/5.10/default.nix +++ b/pkgs/development/libraries/qt-5/5.10/default.nix @@ -37,7 +37,9 @@ let srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch; + qtbase = [ ./qtbase.patch ] ++ + optionals stdenv.isDarwin [ ./qtbase-darwin.patch + ./restore-pc-files.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; diff --git a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch new file mode 100644 index 00000000000..a2355549d4a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch @@ -0,0 +1,15 @@ +Partially reverts <https://codereview.qt-project.org/#/c/140954/>. + +diff --git i/mkspecs/features/qt_module.prf w/mkspecs/features/qt_module.prf +index bb28af97..36bb6483 100644 +--- i/mkspecs/features/qt_module.prf ++++ w/mkspecs/features/qt_module.prf +@@ -245,7 +245,7 @@ load(qt_installs) + load(qt_targets) + + # this builds on top of qt_common +-!internal_module:!lib_bundle:if(unix|mingw) { ++!internal_module:if(unix|mingw) { + CONFIG += create_pc + QMAKE_PKGCONFIG_DESTDIR = pkgconfig + host_build: \ \ No newline at end of file |