Merge pull request #57097 from FlorianFranzen/qmake-header

qtbase: Fix paths returned by qmake -query
This commit is contained in:
Thomas Tuegel 2019-07-15 08:48:23 -05:00 committed by GitHub
commit e92a2f2fc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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.)
''