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

qt5*.qtbase: fixup output references

Browse Source 
Hopefully I haven't missed any references in qt5*.
This commit is contained in:
Vladimír Čunát 2016-01-28 13:24:26 +01:00
parent 2cc537bd06
commit 363f667e8b
8 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
View File

@ -60,27 +60,27 @@ stdenv.mkDerivation {
sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \ 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 \ 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 \ substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
--replace "@libXcursor@" "${libXcursor}" --replace "@libXcursor@" "${libXcursor.out}"
substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \ substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
--replace "@openssl@" "${openssl}" --replace "@openssl@" "${openssl.out}"
substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \ substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
--replace "@dbus_libs@" "${dbus}" --replace "@dbus_libs@" "${dbus.lib}"
substituteInPlace \ substituteInPlace \
qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
--replace "@libX11@" "${libX11}" --replace "@libX11@" "${libX11.out}"
'' ''
+ lib.optionalString gtkStyle '' + 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 \ substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
--replace "@gtk@" "${gtk}" \ --replace "@gtk@" "${gtk.out}" \
--replace "@gnome_vfs@" "${gnome_vfs}" \ --replace "@gnome_vfs@" "${gnome_vfs}" \
--replace "@libgnomeui@" "${libgnomeui}" \ --replace "@libgnomeui@" "${libgnomeui}" \
--replace "@gconf@" "${GConf}" --replace "@gconf@" "${GConf}"
@ -88,8 +88,10 @@ stdenv.mkDerivation {
+ lib.optionalString mesaSupported '' + lib.optionalString mesaSupported ''
substituteInPlace \ substituteInPlace \
qtbase/src/plugins/platforms/xcb/qglxintegration.cpp \ qtbase/src/plugins/platforms/xcb/qglxintegration.cpp \
--replace "@mesa@" "${mesa}" --replace "@mesa_lib@" "${mesa.out}"
substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}" substituteInPlace qtbase/mkspecs/common/linux.conf \
--replace "@mesa_lib@" "${mesa.out}" \
--replace "@mesa_inc@" "${mesa.dev}"
''; '';
preConfigure = '' preConfigure = ''
@ -172,7 +174,7 @@ stdenv.mkDerivation {
# PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
# if dependency paths contain the string "pq", which can occur in the hash. # if dependency paths contain the string "pq", which can occur in the hash.
# To prevent these failures, we need to override PostgreSQL detection. # 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 = [ propagatedBuildInputs = [
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi xlibs.libXcomposite libX11 libxcb libXext libXrender libXi

2
pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch
View File

@ -10,7 +10,7 @@ Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qglxi
QLibrary lib(QLatin1String("GL")); QLibrary lib(QLatin1String("GL"));
+ if (!lib.load()) { + if (!lib.load()) {
+ // Fallback to Mesa driver + // Fallback to Mesa driver
+ lib.setFileName(QLatin1String("@mesa@/lib/libGL")); + lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
+ } + }
glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
} }

2
pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
View File

@ -7,7 +7,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_u
#endif #endif
{ {
- lib.setFileName(QLatin1String("resolv")); - lib.setFileName(QLatin1String("resolv"));
+ lib.setFileName(QLatin1String("@glibc/lib/resolv")); + lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
if (!lib.load()) if (!lib.load())
return; return;
} }

4
pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch
View File

@ -8,8 +8,8 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
QMAKE_LIBDIR_X11 = QMAKE_LIBDIR_X11 =
-QMAKE_INCDIR_OPENGL = -QMAKE_INCDIR_OPENGL =
-QMAKE_LIBDIR_OPENGL = -QMAKE_LIBDIR_OPENGL =
+QMAKE_INCDIR_OPENGL = @mesa@/include +QMAKE_INCDIR_OPENGL = @mesa_inc@/include
+QMAKE_LIBDIR_OPENGL = @mesa@/lib +QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib
QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
QMAKE_INCDIR_EGL = QMAKE_INCDIR_EGL =

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

@ -60,27 +60,27 @@ stdenv.mkDerivation {
sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \ 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 \ 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 \ substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
--replace "@libXcursor@" "${libXcursor}" --replace "@libXcursor@" "${libXcursor.out}"
substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \ substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
--replace "@openssl@" "${openssl}" --replace "@openssl@" "${openssl.out}"
substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \ substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
--replace "@dbus_libs@" "${dbus}" --replace "@dbus_libs@" "${dbus.lib}"
substituteInPlace \ substituteInPlace \
qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
--replace "@libX11@" "${libX11}" --replace "@libX11@" "${libX11.out}"
'' ''
+ lib.optionalString gtkStyle '' + 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 \ substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
--replace "@gtk@" "${gtk}" \ --replace "@gtk@" "${gtk.out}" \
--replace "@gnome_vfs@" "${gnome_vfs.out}" \ --replace "@gnome_vfs@" "${gnome_vfs.out}" \
--replace "@libgnomeui@" "${libgnomeui.out}" \ --replace "@libgnomeui@" "${libgnomeui.out}" \
--replace "@gconf@" "${GConf}" --replace "@gconf@" "${GConf}"
@ -88,8 +88,10 @@ stdenv.mkDerivation {
+ lib.optionalString mesaSupported '' + lib.optionalString mesaSupported ''
substituteInPlace \ substituteInPlace \
qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
--replace "@mesa@" "${mesa}" --replace "@mesa_lib@" "${mesa.out}"
substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}" substituteInPlace qtbase/mkspecs/common/linux.conf \
--replace "@mesa_lib@" "${mesa.out}" \
--replace "@mesa_inc@" "${mesa.dev}"
''; '';
preConfigure = '' preConfigure = ''

2
pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
View File

@ -10,7 +10,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_in
QLibrary lib(QLatin1String("GL")); QLibrary lib(QLatin1String("GL"));
+ if (!lib.load()) { + if (!lib.load()) {
+ // Fallback to Mesa driver + // Fallback to Mesa driver
+ lib.setFileName(QLatin1String("@mesa@/lib/libGL")); + lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
+ } + }
glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
} }

2
pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
View File

@ -7,7 +7,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_u
#endif #endif
{ {
- lib.setFileName(QLatin1String("resolv")); - lib.setFileName(QLatin1String("resolv"));
+ lib.setFileName(QLatin1String("@glibc/lib/resolv")); + lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
if (!lib.load()) if (!lib.load())
return; return;
} }

4
pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
View File

@ -8,8 +8,8 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
QMAKE_LIBDIR_X11 = QMAKE_LIBDIR_X11 =
-QMAKE_INCDIR_OPENGL = -QMAKE_INCDIR_OPENGL =
-QMAKE_LIBDIR_OPENGL = -QMAKE_LIBDIR_OPENGL =
+QMAKE_INCDIR_OPENGL = @mesa@/include +QMAKE_INCDIR_OPENGL = @mesa_inc@/include
+QMAKE_LIBDIR_OPENGL = @mesa@/lib +QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib
QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
QMAKE_INCDIR_EGL = QMAKE_INCDIR_EGL =