diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-15 08:48:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-15 08:48:23 -0500 |
| commit | e92a2f2fc2b5ca13c6223c08ac8e1fd5a7bd66dc (patch) | |
| tree | f2bab56f19ca1d58d89be57259b5a94f277b1605 /pkgs/development/libraries/qt-5 | |
| parent | 4a39debcc114f767d4d44f9376c9a105de183c76 (diff) | |
| parent | 0b059cc9561672215c178ccd02f97fd7bf2308f8 (diff) | |
| download | nixpkgs-e92a2f2fc2b5ca13c6223c08ac8e1fd5a7bd66dc.tar nixpkgs-e92a2f2fc2b5ca13c6223c08ac8e1fd5a7bd66dc.tar.gz nixpkgs-e92a2f2fc2b5ca13c6223c08ac8e1fd5a7bd66dc.tar.bz2 nixpkgs-e92a2f2fc2b5ca13c6223c08ac8e1fd5a7bd66dc.tar.lz nixpkgs-e92a2f2fc2b5ca13c6223c08ac8e1fd5a7bd66dc.tar.xz nixpkgs-e92a2f2fc2b5ca13c6223c08ac8e1fd5a7bd66dc.tar.zst nixpkgs-e92a2f2fc2b5ca13c6223c08ac8e1fd5a7bd66dc.zip | |
Merge pull request #57097 from FlorianFranzen/qmake-header
qtbase: Fix paths returned by qmake -query
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8506a80ddf3..a1c3bea866e 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { NIX_OUTPUT_BIN = $bin NIX_OUTPUT_DEV = $dev NIX_OUTPUT_OUT = $out - NIX_OUTPUT_DOC = $dev/$qtDocPrefix + NIX_OUTPUT_DOC = $out/$qtDocPrefix NIX_OUTPUT_QML = $bin/$qtQmlPrefix NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix EOF @@ -387,6 +387,18 @@ stdenv.mkDerivation { moveToOutput bin "$dev" '' + # Fix paths returned by qmake -query + + '' + cat > $dev/bin/qt.conf <<EOF + [Paths] + Prefix = $out + Headers = $dev/include + Plugins = $bin/$qtPluginPrefix + Documentation = $out/$qtDocPrefix + HostBinaries = $dev/bin + EOF + '' + + ( # fixup .pc file (where to find 'moc' etc.) '' |