diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-02 17:20:24 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-12-02 17:22:17 +0000 |
| commit | a1b77bfe5ff91a250217b47adbbc961cc61a21e3 (patch) | |
| tree | 0273d9c5d33de68e8ac92c807de3779dd16d152b /pkgs/development/libraries/qt-5/modules | |
| parent | af9cf7ec77ea9cdd95bf148c8a03eb7d6aaba8e1 (diff) | |
| download | nixlib-a1b77bfe5ff91a250217b47adbbc961cc61a21e3.tar nixlib-a1b77bfe5ff91a250217b47adbbc961cc61a21e3.tar.gz nixlib-a1b77bfe5ff91a250217b47adbbc961cc61a21e3.tar.bz2 nixlib-a1b77bfe5ff91a250217b47adbbc961cc61a21e3.tar.lz nixlib-a1b77bfe5ff91a250217b47adbbc961cc61a21e3.tar.xz nixlib-a1b77bfe5ff91a250217b47adbbc961cc61a21e3.tar.zst nixlib-a1b77bfe5ff91a250217b47adbbc961cc61a21e3.zip | |
Revert "qt5: 5.9.1 -> 5.9.3"
KDE frameworks 5.40 are not compatible with Qt 5.9.3: #32253 This reverts commit bd71d3aef7a61f1c01e14fa5c0ec7f6f6a7dc56e (#32100).
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 172b20bc51bb..36238b5faddf 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -3,7 +3,7 @@ src, patches, version, qtCompatVersion, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, which, + ruby, # darwin support darwin, libiconv, libcxx, @@ -84,7 +84,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig python2 which ] + [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf; propagatedNativeBuildInputs = [ lndir ]; |