Revert "qtbase: Fix paths returned by qmake -query"
This commit is contained in:
parent
0f6bda38fe
commit
299e9345a8
1 changed files with 1 additions and 13 deletions
|
@ -171,7 +171,7 @@ stdenv.mkDerivation {
|
|||
NIX_OUTPUT_BIN = $bin
|
||||
NIX_OUTPUT_DEV = $dev
|
||||
NIX_OUTPUT_OUT = $out
|
||||
NIX_OUTPUT_DOC = $out/$qtDocPrefix
|
||||
NIX_OUTPUT_DOC = $dev/$qtDocPrefix
|
||||
NIX_OUTPUT_QML = $bin/$qtQmlPrefix
|
||||
NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix
|
||||
EOF
|
||||
|
@ -387,18 +387,6 @@ 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.)
|
||||
''
|
||||
|
|
Loading…
Reference in a new issue