Commit graph

65 commits

Author SHA1 Message Date
Thomas Tuegel a5a031c8ff wrapQtProgram: --set does not take separator
The --set flag to wrapProgram does not take a separator character, just
a value.
2015-10-05 13:08:26 -05:00
Bjørn Forsman 3dec100104 qt55: apply mkspecs-libgl.patch from qt54 2015-09-28 10:39:11 +02:00
Bjørn Forsman 583845d00b qt54: add missing mesa include dir
Try to build e.g. the Qt5 Camera Example[1] and see that qmake fails to
find <GL/gl.h>. This fixes it.

[1] http://doc.qt.io/qt-5/qtmultimediawidgets-camera-example.html
(Although since nixpkgs qtcreator still lacks 'examples', we have to
download the sources manually and use "qmake && make".)
2015-09-28 10:39:11 +02:00
Thomas Tuegel fe49213ba6 qt55: init at 5.5.0 2015-09-27 09:46:48 -05:00
Arseniy Seroka d9b4d81a39 Merge pull request #10003 from gebner/qutebrowser-youtube
qutebrowser: youtube support
2015-09-23 18:26:04 +03:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Gabriel Ebner 449b6028a6 qt5.multimedia: fix gstreamer support. 2015-09-22 18:45:45 +02:00
Thomas Tuegel e5b124e492 qt5Full: only include derivations 2015-09-19 11:37:39 -05:00
Thomas Tuegel 824f7a0962 Remove Qt 5.3 2015-09-19 10:03:09 -05:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Thomas Tuegel e9a8c5a988 Merge pull request #9524 from bjornfor/qt5-mkspecs-libgl
qt5: embed path to mesa (libGL) in Qt mkspecs file
2015-08-29 18:11:15 -05:00
Thomas Tuegel b873f5bd62 Add qtEnv 2015-08-29 17:47:49 -05:00
Bjørn Forsman 06ed82677a qt5: embed path to mesa (libGL) in Qt mkspecs file
Fixes this problem, when building apps in QtCreator:

  ...(compile output window)
  g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
      -o qt-test3 main.o mainwindow.o moc_mainwindow.o \
      -L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
      -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL
  collect2: error: ld returned 1 exit status

mesa is already in the closure of Qt, so there is no size increase.
The patch is copied into both qt-5.3 and qt-5.4 directories, like other
patches are.

Note that programs still can _run_ against a different libGL (e.g. one
provided by nvidia) by configuring the dynamic linker. For instance,
NixOS sets the LD_LIBRARY_PATH environment variable to
/run/opengl-driver/lib/, meaning that whatever libGL is found there
will be used instead of the default (mesa).
2015-08-29 22:21:57 +02:00
Thomas Tuegel b5b78eaf44 qt54: create share/ in setupHook 2015-08-23 14:29:09 -05:00
Thomas Tuegel 4098e79378 qt54: set documentation path in setupHook 2015-08-23 13:47:24 -05:00
Thomas Tuegel e40579d91e qt54: set runtime env vars during build for makeWrapper
Set QT_PLUGIN_PATH, QML_IMPORT_PATH, and QML2_IMPORT_PATH during build
so that Qt programs may easily be wrapped for use outside NixOS. The
paths are set appropriately for the dependencies of the package.
2015-08-23 10:16:21 -05:00
Bjørn Forsman 019a23db3e qt5: specify docdir
Due to a bug somewhere, the qt documentation is by default placed in
$out/share/doc although "qmake -query" reports $out/doc. That
discrepancy causes qtcreator withDocumentation builds to fail. This
fixes it.
2015-08-23 09:56:09 +02:00
Bjørn Forsman c2a8e5e609 qt53: sync plugin/import/qml dirs with qt54
It seems like a sensible thing to keep these in sync.
2015-08-23 09:56:09 +02:00
Thomas Tuegel 28f0eb5af8 qt54: gdb required only for developerBuild 2015-08-08 15:23:48 -05:00
Thomas Tuegel bdb24b90c8 qt53: gdb required only for developerBuild 2015-08-08 15:23:05 -05:00
Thomas Tuegel 6a10139bba qt53: disable unsupported SIMD instruction sets 2015-07-20 15:04:44 -05:00
Thomas Tuegel 4d36b10f90 qt53: override postgresql autodetection 2015-07-20 15:03:52 -05:00
Thomas Tuegel 965f330c65 qt5.base: disable unsupported SIMD instruction sets
If not explicitly disabled, Qt tries to detect support for the various
instruction sets. As a result, binaries built on Hydra may use
instruction sets unsupported by clients.
2015-07-20 08:46:20 -05:00
Thomas Tuegel 17a65c4bf0 qt5.base: override postgresql autodetection 2015-07-20 08:41:57 -05:00
Thomas Tuegel 3f3da5ccbd qt5.base: install setupHook correctly 2015-07-19 13:38:51 -05:00
Thomas Tuegel bb6459dd0b qt5.base: use pkgconfig unconditionally 2015-07-19 13:38:36 -05:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Pascal Wittmann 8a3a3c7c4b qt54: fix setup-hook.sh, lib/ was not populated in some cases 2015-07-01 20:38:03 +02:00
Thomas Tuegel 036f11f323 qt5: set location to qmake in setup-hook 2015-07-01 12:14:43 -05:00
Thomas Tuegel 9333155666 qt5: set paths correctly 2015-07-01 12:14:33 -05:00
Thomas Tuegel 09a53440f1 qt54: don't propagate build inputs
This disables propagated of Qt 5 build inputs at the request of
@edolstra. If this breaks your build, you need to add the missing
dependencies yourself. If this breaks your package at runtime, you need
to wrap your package to set either the plugin path or the QML import
path.
2015-06-25 09:03:41 -05:00
Thomas Tuegel fa9ed76122 qt54: regenerate manifest 2015-06-25 09:03:41 -05:00
Fabian Schmitthenner 4e9327e7ac add qt decrypt ssl traffic option
this introduces an argument to qt5 that if enabled allows
e.g. wireshark to show decrypted ssl traffic from a qt
application
2015-06-12 13:09:27 +02:00
Thomas Tuegel e0db2213fc Update qt-5.4.1 -> qt-5.4.2 2015-06-07 22:18:35 -05:00
William A. Kennington III b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Thomas Tuegel b84f3e85d9 Fix QGtkStyle for Qt 5 versions 2015-05-19 11:37:21 -05:00
Thomas Tuegel 7094ae27da qt53: fix qtwebkit build with new glib 2015-05-13 12:49:14 -05:00
Ellis whitehead bafde0fb6f patch Qt 5.4.1 to use XDG_CONFIG_DIRS in QSettings 2015-04-23 17:52:22 +02:00
Thomas Tuegel 88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Thomas Tuegel 74b2253ef8 qt54: remove obsolete qmake expression 2015-04-07 16:30:57 -05:00
Ambroz Bizjak 35fb8d9eb9 Qt 5.4.1: Make it build.
Looks like the original version update was incomplete. This sets the right
version attribute and fixes two patches which no longer apply.
2015-04-07 11:26:48 -05:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
aszlig 8769f43aa4
qt-5.4: Fix reference to MySQL library.
The MySQL library has been split up from the main client/server binaries
in 53f1d8147d.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-02 13:31:35 +02:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Thomas Tuegel 5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Thomas Tuegel ad49ea230a qt54: update to qt-5.4.1 2015-03-24 17:14:56 -05:00
Thomas Tuegel 0cf073627c remove split qt-5.3 2015-02-21 11:39:19 -06:00
Thomas Tuegel 2e38240c95 add qt-5.4 2015-02-21 11:39:18 -06:00
Thomas Tuegel 042e4ad633 qt5split: add split submodule build of Qt 5.3 2015-02-07 12:52:20 -06:00
Thomas Tuegel fa56e5ffa7 qt5: move monolithic build 2015-02-07 07:30:18 -06:00