cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "qtbase: Fix paths returned by qmake -query"

Browse source
This commit is contained in:
Thomas Tuegel 2019-07-26 18:53:12 -05:00 committed by GitHub
parent 0f6bda38fe
commit 299e9345a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 13 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

@ -171,7 +171,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 = $out/$qtDocPrefix NIX_OUTPUT_DOC = $dev/$qtDocPrefix
NIX_OUTPUT_QML = $bin/$qtQmlPrefix NIX_OUTPUT_QML = $bin/$qtQmlPrefix
NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix
EOF EOF
@ -387,18 +387,6 @@ 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.)
'' ''