public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35349 from matthewbauer/qt5-darwin-pkgconfig

Browse Source 
qt5: install pkg_config files on darwin
This commit is contained in:
Daiderd Jordan 2018-02-27 00:05:56 +01:00 committed by GitHub
commit b4cf3f7909
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/5.10/default.nix
View File

@ -37,7 +37,9 @@ let
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
patches = { 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 ]; qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ]; qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ]; qtserialport = [ ./qtserialport.patch ];

15
pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch Normal file
View File

@ -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: \