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

qtbase: Fix paths returned by qmake -query

Browse Source
This commit is contained in:
Florian Franzen 2019-03-09 20:46:23 +01:00
parent 3ea5f97ac4
commit 0b059cc956
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -175,7 +175,7 @@ stdenv.mkDerivation {
NIX_OUTPUT_BIN = $bin NIX_OUTPUT_BIN = $bin
NIX_OUTPUT_DEV = $dev NIX_OUTPUT_DEV = $dev
NIX_OUTPUT_OUT = $out NIX_OUTPUT_OUT = $out
NIX_OUTPUT_DOC = $dev/$qtDocPrefix NIX_OUTPUT_DOC = $out/$qtDocPrefix
NIX_OUTPUT_QML = $bin/$qtQmlPrefix NIX_OUTPUT_QML = $bin/$qtQmlPrefix
NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix
EOF EOF
@ -376,6 +376,18 @@ stdenv.mkDerivation {
moveToOutput bin "$dev" 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.) # fixup .pc file (where to find 'moc' etc.)
'' ''