mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity
83145 commits 218 branches 122 tags 7.1 GiB
Commit graph

191 commits

Author SHA1 Message Date
Thomas Tuegel 776de6d955 qt55.qtconnectivity: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel aea5ee64db qt55.qtenginio: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 35c7cdac5f qt55.qtlocation: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel ea0794696f qt55.qtmultimedia: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 89dc8118b4 qt55.qtquick1: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel abcb26c2bb qt55.qtsensors: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 50de9a3f09 qt55.qtserialport: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 02f2761233 qt55.qtsvg: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel ed20a6a97c qt55.qttools: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel db7cabe098 qt55.qtwebkit: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel da454bc547 qt55.qtwebsockets: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 055b1b86c5 qt55.qtx11extras: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 27824e3332 qt55.qtxmlpatterns: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 6c37bebabd qt55.qtdeclarative: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 6dfabcb47b qt55.qtscript: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 8bfae5c46d qt55.qtbase: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel ac5a585ed8 qt55: add fixQtModuleCMakeConfig setup hook 2016-01-31 21:15:03 -06:00
Thomas Tuegel 4465f438de qt55: improve update documentation 2016-01-31 21:15:03 -06:00
Thomas Tuegel a6c9a6f5bf qt55.qtbase: set licenses correctly 2016-01-31 21:15:03 -06:00
Thomas Tuegel 9adcd6f78c qt55: update homepage 2016-01-31 21:15:03 -06:00
Thomas Tuegel 6dda0824ba qt55.qtbase: use -system-harfbuzz 2016-01-31 21:15:03 -06:00
Thomas Tuegel 74121e07a7 qt55: use multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel db69888a02 qt55.qtbase: disable documentation 
The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
 2016-01-31 21:15:03 -06:00
Thomas Tuegel 3cfb552bbc qt55.qtbase: don't depend on makeWrapper 2016-01-31 21:15:03 -06:00
Thomas Tuegel 302450dbfe qt55.qtbase: don't propagate extra Mesa dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel e64822b87d qt55.qtbase: don't propagate gtk dependencies 2016-01-31 21:15:03 -06:00
Thomas Tuegel 4b844747a2 qt55.qtbase: don't propagate postgresql dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel d5d7554639 qt55.qtbase: don't propagate mysql dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel 5337a2a4b3 qt55.qtbase: don't propagate cups dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel fcf290cd1d qt55.qtbase: don't refer to .dev outputs at runtime 2016-01-31 21:15:03 -06:00
Thomas Tuegel 0055c6aa94 qt54: use multiple outputs 2016-01-31 21:14:24 -06:00
Thomas Tuegel d8a08fff90 qt54: disable documentation 
The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
 2016-01-31 21:14:24 -06:00
Thomas Tuegel 67d5a026ca qt54.qtbase: don't propagate makeWrapper dependency 
I have no idea how it even got here; it's certainly not necessary!
 2016-01-31 21:14:24 -06:00
Thomas Tuegel 4ed8d5d125 qt54.qtbase: don't propagate extra Mesa dependency 
The note accompanying this dependency says "it's small and doesn't
remain a runtime-dep if not used," but *neither* of those statements is
true.
 2016-01-31 21:14:24 -06:00
Thomas Tuegel a6fd9e9be6 qt54.qtbase: don't propagate gtk dependencies 
It is not necessary to propagate the GTK dependencies if Qt is
configured with the GTK Style enabled.
 2016-01-31 21:14:24 -06:00
Thomas Tuegel b0753cec2a qt54.qtbase: don't propagate postgresql dependency 
It is not necessary to propagate the postgresql buildInput if Qt is
configured with PostgreSQL enabled.
 2016-01-31 21:14:24 -06:00
Thomas Tuegel 5fb4e3b338 qt54.qtbase: don't propagate mysql dependency 
It is not necessary to propagate the mysql buildInput if Qt is configure
with MySQL enabled.
 2016-01-31 21:14:24 -06:00
Thomas Tuegel c1f0f62a9c qt54.qtbase: don't propagate cups dependency 
It is not necessary to propagate the cups buildInput if Qt is configured
with cups enabled.
 2016-01-31 21:14:24 -06:00
Thomas Tuegel 66d76f8b5b qt54.qtbase: don't rever to .dev outputs at runtime 2016-01-31 21:14:24 -06:00
Thomas Tuegel 9e743fd151 qt54.qtbase: fix path typo in resolv patch 2016-01-28 11:15:58 -06:00
Thomas Tuegel 9695e139ec qt55.qtbase: fix path typo in resolv patch 2016-01-28 11:15:14 -06:00
Vladimír Čunát 363f667e8b qt5*.qtbase: fixup output references 
Hopefully I haven't missed any references in qt5*.
 2016-01-28 13:31:17 +01:00
Thomas Tuegel 21bebe1592 qt55.qtbase: fix syntax error 2016-01-23 07:52:29 -06:00
Thomas Tuegel 2b76df28b0 qt54.qtbase: fix evaluation error 2016-01-23 07:03:11 -06:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Robin Gloster 99b1b464b4 qt55.qtbase: add patch to build with libressl 2.3 2015-12-23 22:10:01 +00:00
Thomas Tuegel f250a6e64e qt5: build env and full per version 2015-12-20 07:56:38 -06:00
Thomas Tuegel 1402c20bfd qt54: backport Qt infrastructure changes from Qt 5.5 2015-12-19 16:20:27 -06:00
Thomas Tuegel 36dda92317 qt55.qtbase: don't interpolate needlessly 2015-12-19 12:26:54 -06:00
Thomas Tuegel 09e9e3e359 fixup! qt55.qtbase: don't include optional dependencies unconditionally 2015-12-19 12:26:45 -06:00
Thomas Tuegel 98e2fbe630 qt55.qtbase: remove non-existent paths from LD_LIBRARY_PATH 2015-12-19 12:18:48 -06:00
Thomas Tuegel 0a54898a20 qt55.qtbase: don't include optional dependencies unconditionally 2015-12-19 12:18:06 -06:00
Thomas Tuegel 9f62af0885 qt55.qtbase: fallback libGL path 
If libGL is not found on the system library path, fall back to the
default Mesa driver.
 2015-12-19 12:15:33 -06:00
Thomas Tuegel 081b1f1707 qt55.qtbase: set compose search path 
This was previously set using substituteInPlace, but this leads to
duplicate search paths.
 2015-12-19 12:02:57 -06:00
Thomas Tuegel 14f27e5eb7 qt55.qtbase: move sed scripts to postPatch 2015-12-19 11:59:05 -06:00
Thomas Tuegel 8b890cac07 qt55.qtbase: manage patches with quilt 2015-12-19 11:56:50 -06:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Thomas Tuegel 4cb7779a5a qt55: 5.5.0 -> 5.5.1 2015-11-23 12:58:39 -06:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Bjørn Forsman 2cec70ce6c qt55: fix qtmultimedia gstreamer support 
Without this, configure will say:

  Checking for openal... no
  /tmp/nix-build-qtmultimedia-5.5.0.drv-0/qtmultimedia-opensource-src-5.5.0/qtmultimedia.pro:28:
  Variable GST_VERSION is not defined.
  Checking for resourcepolicy... no

And there may be application runtime errors like

  defaultServiceProvider::requestService(): no service found for - "org.qt-project.qt.camera"

After this fix, configure will say:

  Checking for openal... no
  Checking for gstreamer... yes
  Checking for gstreamer_photography... no
  Checking for gstreamer_encodingprofiles... yes
  Checking for gstreamer_appsrc... yes
  Checking for linux_v4l... yes
  Checking for resourcepolicy... no

And the above runtime error will not appear.

This fix is similar to 449b6028 ("qt5.multimedia: fix gstreamer
support."), except with Qt 5.5 we also need to set GST_VERSION.
 2015-11-09 10:55:04 +01:00
Thomas Tuegel 24babaad9a makeQtWrapper: wrap XDG directories 2015-10-31 08:48:53 -05:00
Thomas Tuegel dcd70c54aa qtbase: copy qmake to temp dir 
Fixes #10273.
 2015-10-31 08:48:45 -05:00
Thomas Tuegel 361b1165ef qtbase: propagate runtime dependencies 
This is done so that makeQtWrapper works correctly.
 2015-10-30 16:10:37 -05:00
Thomas Tuegel 9fa17aa293 kdoctools: set XDG_DATA_DIRS in setupHook 2015-10-30 16:10:37 -05:00
Thomas Tuegel 5a2c45427b makeQtWrapper: always wrap impurely 2015-10-30 16:10:37 -05:00
Thomas Tuegel fb375f1a2e qt55: set QML import paths from NIX_PROFILES 2015-10-30 16:10:37 -05:00
Thomas Tuegel b1f904f69a qt55: set Qt Quick import paths from NIX_PROFILES 2015-10-30 16:10:37 -05:00
Thomas Tuegel a3855ef9ae qt55: set library paths from NIX_PROFILES 2015-10-30 16:10:37 -05:00
Thomas Tuegel d57e50d840 separate makeQtWrapper from qtbase setup-hook 2015-10-30 16:10:37 -05:00
Thomas Tuegel 89d31daa8f qtmultimedia: build with gstreamer-1.0 
Fixes #10289.
 2015-10-30 16:10:37 -05:00
Thomas Tuegel a122ca8ba3 qt55.qtbase: add makeQtWrapper 2015-10-30 16:10:37 -05:00
Thomas Tuegel ebb9c07168 qtbase: remove redundant directory checks 
addToSearchPath already checks if the directory exists before adding it
to the path; it's not necessary to check it again.
 2015-10-30 16:10:37 -05:00
Thomas Tuegel b44923561b qtbase: include current package in runtime paths 
The runtime paths QT_PLUGIN_PATH, QML_IMPORT_PATH, QML2_IMPORT_PATH, and
XDG_DATA_DIRS did not include the appropriate paths from the current
package being built because addToSearchPath does not add directories
which don't exist.
 2015-10-30 16:10:37 -05:00
Vladimír Čunát 261961c97d postgresql: split and fixup some referrers 2015-10-28 10:09:32 +01:00
Vladimír Čunát 783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát debdd33fc8 qt5: lib location fixes, mainly due to multiple outputs 2015-10-13 20:18:59 +02:00
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