mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-19 03:48:57 +00:00
Code Issues Wiki Activity
126856 commits 187 branches 125 tags 8.3 GiB
Commit graph

428 commits

Author SHA1 Message Date
Thomas Tuegel 4a39533ab3
qt5: debug flag should never be null 2018-01-20 09:10:57 -06:00
Thomas Tuegel c1720b412b
qt5.mkDerivation: honor argument NIX_CFLAGS_COMPILE 
If ‘mkDerivation’ is passed ‘NIX_CFLAGS_COMPILE’, we should include those flags
along with the common flags.

See also: #34039 #34038 #33935 #33933 #33930 #33927
 2018-01-20 09:10:57 -06:00
Daiderd Jordan 62633d0605
qt510-qtbase: fix darwin build 
Includes most of the changes from 3793320958,
moved it to a separate patch to avoid accidental removal.
 2018-01-17 22:07:35 +01:00
Thomas Tuegel 5783980fc6
qtbase: fix evaluation error 
`git rebase` strikes again!
 2018-01-15 19:12:01 -06:00
Thomas Tuegel 04239641b5
Merge branch 'bugfix/qt-5/closure-size-static-libs' into merge/qt-5.10.0 2018-01-15 18:49:27 -06:00
Thomas Tuegel 617c4f4220
Merge branch 'feature/qt-5/5.10.0' into merge/qt-5.10.0 2018-01-15 18:49:13 -06:00
Thomas Tuegel 75d2a7dc4d
qt5: reduce closure size 
First, closure size is reduced by including the static libraries in $out instead
of trying to move them to $dev. The Qt build system cannot handle libraries
being split between different prefixes. Previously, the static libraries were
moved into $dev and the shared libraries were symlinked from $out to $dev to
fool the build system. However, this causes $dev to be retained at
runtime. Instead, we now keep the static libraries in $out. Fortunately, the
static libraries are not very large anyway.

Second, we build with QT_NO_DEBUG defined unless debugging is enabled. This
causes some assertions to be removed; when assertions are included, they pull
paths from $dev into the runtime closure by using the __FILE__ macro. We also
now patch qtbase to remove even more assertions when QT_NO_DEBUG is defined.
 2018-01-15 18:48:37 -06:00
Daiderd Jordan 3793320958
qt5-qtbase: update darwin patch 2018-01-09 22:47:34 +01:00
Will Dietz 42b84057a4 qt5.6: backport seccomp patch to fix errors w/new glibc + epoll_pwait 
Based on:
4e8083b4ab

Fixes mendeley bug mentioned in #33396,
which links to related issues in other distributions and upstream Qt.
 2018-01-04 13:08:51 -06:00
Bastian Köcher e5b1a5724e Qt5: 5.9.3 -> 5.10.0 2018-01-02 14:01:37 +01:00
John Ericson 4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant 
Make cross compilation elegant
 2017-12-30 22:58:02 -05:00
John Ericson 046f091e0d treewide: Don't use envHook anymore 
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
 2017-12-30 22:04:22 -05:00
Vladimír Čunát f29000b002
Merge branch 'master' into staging 
Hydra: ?compare=1421760
 2017-12-29 10:13:33 +01:00
Robin Gloster 9359050ae2 mariadb: more lib -> connector-c 2017-12-29 02:18:35 +01:00
adisbladis 907face464
qt5: Add qtvirtualkeyboard submodule 2017-12-28 21:13:45 +08:00
Orivej Desh fb349c84e2 qt5.qttools: install macdeployqt on darwin 2017-12-20 08:56:54 +00:00
Thomas Tuegel 145e0f9940
Revert "Revert "qt5: 5.9.1 -> 5.9.3"" 
This reverts commit a1b77bfe5f.

KDE Frameworks are updated to version 5.41.0 which is compatible with Qt 5.9.3.
 2017-12-11 11:32:16 -06:00
Orivej Desh f568450637 qmake: enable parallel building of qmake projects by default 2017-12-07 08:52:42 +00:00
John Ericson 405412dfd9
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files 
stdenv setup: Always use both propagated files
 2017-11-22 15:23:37 -05:00
John Ericson da19c34d0f stdenv setup: Always use both propagated files 
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
 2017-11-21 10:44:44 -05:00
Orivej Desh 031367af2b qt56.qtwebengine: fix build 
Delete the patch, it has been integrated into Qt 5.6.3.
 2017-11-17 02:51:58 +00:00
Thomas Tuegel d3efa486e5
qt59.qtbase: carefully avoid applying Linux flags to Darwin build 2017-11-12 09:51:48 -06:00
Thomas Tuegel ded18e4f47
qt59.qtbase: restore Darwin collection-types patch 2017-11-12 09:51:48 -06:00
Thomas Tuegel 2063d54c72
qt56: 5.6.2 -> 5.6.3 2017-11-12 09:51:48 -06:00
Thomas Tuegel 04ba30ef8e
qt59.qtbase: replace type with command for POSIX compatibility 2017-11-12 09:51:48 -06:00
Thomas Tuegel 3729b77531
qt5.mkDerivation: default enableParallelBuilding = true 2017-11-12 09:51:48 -06:00
Thomas Tuegel 4f72831934
qt56.qtbase: replace type with command for POSIX compatibility 2017-11-12 09:51:47 -06:00
Thomas Tuegel 9e05d61dd7
qt56: remove unused obsolete expressions 2017-11-12 09:51:47 -06:00
Thomas Tuegel 91b362c5cf
qt56.qtwebkit: fix build with ICU 59 2017-11-12 09:51:47 -06:00
Peter Simons c1c21cde1d
Revert "qt5: Add qtnetworkauth submodule" 2017-11-11 17:53:01 +01:00
Thomas Tuegel 1e9edbf6ee
Merge pull request #28480 from ilpianista/qt5 
qt5: Add qtnetworkauth submodule
 2017-11-11 08:25:10 -06:00
Thomas Tuegel ae6ac0ed3e
qt5: Add instructions for updating and patching 2017-11-07 07:18:50 -06:00
Thomas Tuegel fe0ab944db
qt5: factor out common definitions and remove symlink farm 
The module definitions are factored out and shared between qt56 and qt59. The
symlink farm which was created during builds is no longer needed.
 2017-11-07 07:18:46 -06:00
Thomas Tuegel 4866f16fba
Revert "Merge pull request #30255 from bkchr/qt_5_9_2" 
This reverts commit 4cf0b6ba5d, reversing
changes made to 756b9c7d6c.

Qt 5.9.2 is reverted to Qt 5.9.1, as recommended by KDE upstream due to
https://bugreports.qt.io/browse/QTBUG-64017
 2017-11-02 14:28:39 -05:00
Tuomas Tynkkynen fd29f6685f qt5, plasma-5: Make 'bin' output the first one 
Stay consistent with other multiple output packages.
 2017-10-24 23:48:49 +03:00
Daiderd Jordan 215f2cac80 Merge pull request #30404 from j-hao/master 
qt5: fix Darwin build for 5.9.2
 2017-10-19 23:41:44 +02:00
Bastian Köcher 7132cbd598
qt5: Disable gold linker on Linux as it generates duplicate symbols 
Signed-off-by: adisbladis <adis@blad.is>
 2017-10-19 11:09:25 +08:00
Jun Hao c800d574bf qt5: fix Darwin build for 5.9.2 2017-10-17 13:18:33 +08:00
Vladimír Čunát 26db832fee
qt56.qtwebkit: fix with icu-59 by upstream patch 
The patch is from qtwebkit-5.9.1, but it's fairly simple and seems to
work here as well.
 2017-10-15 15:16:53 +02:00
Thomas Tuegel 4cf0b6ba5d Merge pull request #30255 from bkchr/qt_5_9_2 
qt5: 5.9.1 -> 5.9.2
 2017-10-12 09:08:59 -05:00
Jun Hao 9dd335e2bb qt59.qtbase: fix darwin build so qt full can build 2017-10-11 14:38:49 +08:00
Robin Gloster 1fbf00f0ae
Revert "qt59.qtwebengine: fix build (re: nss update)" 
This reverts commit 8a928f3916.
 2017-10-09 20:50:38 +02:00
Bastian Köcher c8bac00921 qt5: 5.9.1 -> 5.9.2 2017-10-09 19:38:38 +02:00
Michael Raskin 8a928f3916 qt59.qtwebengine: fix build (re: nss update) 2017-10-09 18:15:30 +02:00
John Ericson f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Vladimír Čunát e83b78b3ed
Merge older staging 
This is almost fully rebuilt on staging (waiting for ~7.5k Darwin jobs),
but now master got ~17k rebuild, so staging wouldn't catch up this way.
 2017-09-27 20:51:14 +02:00
Vladimír Čunát 41aa302727
Merge branch 'master' into staging 2017-09-26 22:31:59 +02:00
Daiderd Jordan db2538fb0c
qt5-qtbase: fix darwin build 
Fixes #27474
 2017-09-23 21:06:09 +02:00
Thomas Tuegel 5eb2c7a753 Merge pull request #28237 from avnik/qt5-mktemp 
qt5: use `mktemp -d` to create fake Qt prefix in nix-shell
 2017-09-23 07:18:25 -05:00
xd1le 99eabd6c06 qt-5/qtbase-setup-hook.sh: attempt to make directories only if needed 
Resolves #29589.
 2017-09-22 22:26:02 +10:00