diff options
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules/qtbase.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 0c7af9e185d..15e19c77567 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation { [ "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' - ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"'' + ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"'' ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] @@ -243,10 +243,13 @@ stdenv.mkDerivation { "-gui" "-widgets" "-opengl desktop" - "-qml-debug" "-icu" "-pch" ] + ++ lib.optionals (compareVersion "5.11.0" < 0) + [ + "-qml-debug" + ] ++ lib.optionals (compareVersion "5.9.0" < 0) [ "-c++11" @@ -387,7 +390,7 @@ stdenv.mkDerivation { homepage = http://www.qt.io; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ qknight ttuegel periklis ]; + maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; platforms = platforms.unix; }; |