From 4bd911dcd68bdb5747beea47f4e962239438244e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 17 Apr 2017 08:02:48 -0500 Subject: [PATCH] qtbase: fill in configure flags --- .../libraries/qt-5/5.8/qtbase/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix index 8c666c95bec..719afe75a53 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix @@ -105,7 +105,6 @@ stdenv.mkDerivation { "-accessibility" "-optimized-qmake" "-strip" - "-no-reduce-relocations" "-system-proxies" "-pkg-config" ] @@ -151,22 +150,27 @@ stdenv.mkDerivation { ++ lib.optionals (!stdenv.isDarwin) [ "-rpath" - "-glib" + + "-system-xcb" "-xcb" "-qpa xcb" - ''-${lib.optionalString (cups == null) "no-"}cups'' + + "-system-xkbcommon" + "-libinput" + "-xkbcommon-evdev" "-no-eglfs" - "-no-directfb" - "-no-linuxfb" + "-no-gbm" "-no-kms" + "-no-linuxfb" - "-libinput" - "-gtk" - "-system-libpng" - "-system-xcb" - "-system-xkbcommon" + ''-${lib.optionalString (cups == null) "no-"}cups'' "-dbus-linked" + "-glib" + "-gtk" + "-inotify" + "-system-libjpeg" + "-system-libpng" ] ++ lib.optionals stdenv.isDarwin [