diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | |
parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
download | nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.gz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.bz2 nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.lz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.xz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.zst nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.zip |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.5/qtbase/default.nix')
-rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 7 |
1 files changed, 4 insertions, 3 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 68c209e6009..35410d55e66 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -4,7 +4,7 @@ , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon , fontconfig, freetype, harfbuzz -, openssl, dbus, glib, udev, libxml2, libxslt, pcre +, openssl, dbus, glib, udev, libxml2, libxslt, pcre16 , zlib, libjpeg, libpng, libtiff, sqlite, icu , coreutils, bison, flex, gdb, gperf, lndir, ruby @@ -188,11 +188,12 @@ stdenv.mkDerivation { -no-mips_dspr2 -system-zlib - -system-harfbuzz -system-libpng -system-libjpeg + -system-harfbuzz -system-xcb -system-xkbcommon + -system-pcre -openssl-linked -dbus-linked @@ -212,7 +213,7 @@ stdenv.mkDerivation { PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ - dbus glib libxml2 libxslt openssl pcre sqlite udev zlib + dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib # Image formats libjpeg libpng libtiff |