diff options
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 | 32 |
1 files changed, 17 insertions, 15 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 24e5ccb36f37..73fe320769cd 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -60,36 +60,38 @@ stdenv.mkDerivation { sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc}" + --replace "@glibc@" "${stdenv.cc.libc.out}" substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc}" + --replace "@glibc@" "${stdenv.cc.libc.out}" substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor}" + --replace "@libXcursor@" "${libXcursor.out}" substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \ - --replace "@openssl@" "${openssl}" + --replace "@openssl@" "${openssl.out}" substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \ - --replace "@dbus_libs@" "${dbus}" + --replace "@dbus_libs@" "${dbus.lib}" substituteInPlace \ qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace "@libX11@" "${libX11}" + --replace "@libX11@" "${libX11.out}" '' + lib.optionalString gtkStyle '' - substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}" + substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}" substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ - --replace "@gtk@" "${gtk}" \ - --replace "@gnome_vfs@" "${gnome_vfs}" \ - --replace "@libgnomeui@" "${libgnomeui}" \ + --replace "@gtk@" "${gtk.out}" \ + --replace "@gnome_vfs@" "${gnome_vfs.out}" \ + --replace "@libgnomeui@" "${libgnomeui.out}" \ --replace "@gconf@" "${GConf}" '' + lib.optionalString mesaSupported '' substituteInPlace \ qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ - --replace "@mesa@" "${mesa}" - substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}" + --replace "@mesa_lib@" "${mesa.out}" + substituteInPlace qtbase/mkspecs/common/linux.conf \ + --replace "@mesa_lib@" "${mesa.out}" \ + --replace "@mesa_inc@" "${mesa.dev}" ''; preConfigure = '' @@ -172,11 +174,11 @@ stdenv.mkDerivation { # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag # if dependency paths contain the string "pq", which can occur in the hash. # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; + PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ xlibs.libXcomposite libX11 libxcb libXext libXrender libXi - fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre + fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon ] @@ -186,7 +188,7 @@ stdenv.mkDerivation { ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib ++ lib.optional (postgresql != null) postgresql - ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; + ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf]; buildInputs = [ bison flex gperf ruby ] |