diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-03-28 13:27:06 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-31 15:53:06 +0300 |
| commit | f752424924478722229751fa3302de52fdbe214a (patch) | |
| tree | 2f0f24bd5bf8ac70f541f21d03f366753bcc688e /pkgs | |
| parent | 5199176b65a19366a6023edb5e1cf5bc83b26346 (diff) | |
| download | nixpkgs-f752424924478722229751fa3302de52fdbe214a.tar nixpkgs-f752424924478722229751fa3302de52fdbe214a.tar.gz nixpkgs-f752424924478722229751fa3302de52fdbe214a.tar.bz2 nixpkgs-f752424924478722229751fa3302de52fdbe214a.tar.lz nixpkgs-f752424924478722229751fa3302de52fdbe214a.tar.xz nixpkgs-f752424924478722229751fa3302de52fdbe214a.tar.zst nixpkgs-f752424924478722229751fa3302de52fdbe214a.zip | |
qt55.qtbase: use more system libraries
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index e6927ffb9ca..ffa0a95be2c 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -3,8 +3,8 @@ , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon -, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre -, zlib, libjpeg, libpng, libtiff, sqlite, icu +, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre16 +, zlib, libjpeg, libpng, libtiff, sqlite, icu, harfbuzz , coreutils, bison, flex, gdb, gperf, lndir, ruby , python, perl, pkgconfig @@ -164,8 +164,10 @@ stdenv.mkDerivation { -system-zlib -system-libpng -system-libjpeg + -system-harfbuzz -system-xcb -system-xkbcommon + -system-pcre -openssl-linked -dbus-linked @@ -186,8 +188,8 @@ stdenv.mkDerivation { propagatedBuildInputs = [ xlibs.libXcomposite libX11 libxcb libXext libXrender libXi - fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre - zlib libjpeg libpng libtiff sqlite icu + fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre16 + zlib libjpeg libpng libtiff sqlite icu harfbuzz xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and |