public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt55.qtbase: use more system libraries

This commit is contained in:
Nikolay Amiantov 2016-03-28 13:27:06 +03:00
parent 5199176b65
commit f752424924
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
View File

@ -3,8 +3,8 @@
, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre , fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre16
, zlib, libjpeg, libpng, libtiff, sqlite, icu , zlib, libjpeg, libpng, libtiff, sqlite, icu, harfbuzz
, coreutils, bison, flex, gdb, gperf, lndir, ruby , coreutils, bison, flex, gdb, gperf, lndir, ruby
, python, perl, pkgconfig , python, perl, pkgconfig
@ -164,8 +164,10 @@ stdenv.mkDerivation {
-system-zlib -system-zlib
-system-libpng -system-libpng
-system-libjpeg -system-libjpeg
-system-harfbuzz
-system-xcb -system-xcb
-system-xkbcommon -system-xkbcommon
-system-pcre
-openssl-linked -openssl-linked
-dbus-linked -dbus-linked
@ -186,8 +188,8 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ propagatedBuildInputs = [
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre16
zlib libjpeg libpng libtiff sqlite icu zlib libjpeg libpng libtiff sqlite icu harfbuzz
xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
] ]
# Qt doesn't directly need GLU (just GL), but many apps use, it's small and # Qt doesn't directly need GLU (just GL), but many apps use, it's small and