diff options
| author | Florian Franzen <Florian.Franzen@gmail.com> | 2019-03-09 20:46:23 +0100 |
|---|---|---|
| committer | Florian Franzen <Florian.Franzen@gmail.com> | 2019-03-09 20:46:23 +0100 |
| commit | 0b059cc9561672215c178ccd02f97fd7bf2308f8 (patch) | |
| tree | 27e7aecf67b3f688f9d1676e5354674586111590 /pkgs/development/libraries/qt-5/modules | |
| parent | 3ea5f97ac4c44b427fcd1a39f50c430116600677 (diff) | |
| download | nixlib-0b059cc9561672215c178ccd02f97fd7bf2308f8.tar nixlib-0b059cc9561672215c178ccd02f97fd7bf2308f8.tar.gz nixlib-0b059cc9561672215c178ccd02f97fd7bf2308f8.tar.bz2 nixlib-0b059cc9561672215c178ccd02f97fd7bf2308f8.tar.lz nixlib-0b059cc9561672215c178ccd02f97fd7bf2308f8.tar.xz nixlib-0b059cc9561672215c178ccd02f97fd7bf2308f8.tar.zst nixlib-0b059cc9561672215c178ccd02f97fd7bf2308f8.zip | |
qtbase: Fix paths returned by qmake -query
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
| -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 92ac8a242013..b3d12fcea46e 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -175,7 +175,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 @@ -376,6 +376,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.) '' |