Commit graph

51 commits

Author SHA1 Message Date
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277

This removes now also paxutils from stdenv.
2018-12-22 12:55:05 +01:00
Bastian Köcher
8e811ec295 qt5: 5.11 -> 5.12 2018-12-19 09:15:14 +01:00
Jörg Thalheim
7f2c30f851
Merge pull request #50521 from alyssais/qt-cf-private
qt59.qtwebkit: fix build on Darwin
2018-11-21 17:38:10 +00:00
Alyssa Ross
874468f23e
qt59.qtwebkit: fix build on Darwin 2018-11-17 23:17:27 +00:00
Daiderd Jordan
942d90b282
qt5.qtmacextras: include cf-private on darwin
Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in qmacfunctions.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in qmactoolbar.o
          objc-class-ref in qmactoolbardelegate.o
    ld: symbol(s) not found for architecture x86_64
2018-11-17 21:02:22 +01:00
Tom Hall
230f71477b qtwebglplugin: init at 5.11
Note: As with all Qt plugins, must set QT_QPA_PLATFORM_PLUGIN_PATH=~/.nix-profile/lib/qt-5.11/plugins for it to be found.
2018-11-10 19:56:11 +00:00
Jan Malakhovski
c0a4e46714 qt5: use https, tiny cleanup 2018-11-08 05:20:19 +00:00
Daiderd Jordan
9a1a872b4a
qt5.qtbase: add cf-private on darwin
Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in qcore_foundation.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in qcore_foundation.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in qcore_foundation.o
      "_CFURLCopyResourcePropertyForKey", referenced from:
          hasResourcePropertyFlag(QFileSystemMetaData const&, QFileSystemEntry const&, __CFString const*) in qfilesystemengine_unix.o
      "_CFURLCreateBookmarkDataFromFile", referenced from:
          QFileSystemEngine::getLinkTarget(QFileSystemEntry const&, QFileSystemMetaData&) in qfilesystemengine_unix.o
      "_kCFURLIsAliasFileKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_kCFURLIsHiddenKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_kCFURLIsPackageKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_CFURLCreateByResolvingBookmarkData", referenced from:
          QFileSystemEngine::getLinkTarget(QFileSystemEntry const&, QFileSystemMetaData&) in qfilesystemengine_unix.o
    ld: symbol(s) not found for architecture x86_64
2018-11-07 00:58:04 +01:00
Alyssa Ross
1c70685fdb
qt59.qtwebkit: fix build on Darwin
Why is qtmultimedia only needed on Darwin? Why does it only fix 5.9, not
5.11? These things I do not know. What I do know is that, for some
reason, this makes qt59.qtwebkit build on Darwin.

I think the reason it hasn't also fixed 5.11 might be something to do
with the version of qtmultimedia, but I don't know enough about Qt or
cmake to figure it out. The error when trying to build qt511.qtwebkit
(with or without these changes) is:

    CMake Error at Source/cmake/OptionsQt.cmake:739 (find_package):
      Could not find a package configuration file provided by "Qt5Multimedia"
      (requested version 5.2.0) with any of the following names:

        Qt5MultimediaConfig.cmake
        qt5multimedia-config.cmake

      Add the installation prefix of "Qt5Multimedia" to CMAKE_PREFIX_PATH or set
      "Qt5Multimedia_DIR" to a directory containing one of the above files.  If
      "Qt5Multimedia" provides a separate development package or SDK, be sure it
      has been installed.
    Call Stack (most recent call first):
      Source/cmake/WebKitCommon.cmake:50 (include)
      CMakeLists.txt:137 (include)

    -- Configuring incomplete, errors occurred!
    See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeOutput.log".
    See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeError.log".
2018-10-19 10:36:48 +01:00
Eelco Dolstra
9bbd4f653f
qtgraphicaleffects: Add dev output
This shrank my system closure by about 192 MiB.
2018-10-08 16:32:27 +02:00
xeji
c2c9c6adfe
Merge pull request #46385 from xeji/p/broken
mark long-failing packages broken for 18.09
2018-09-15 00:54:49 +02:00
Uli Baum
83e5bbfb58 qt56.qtwebengine: mark as broken
- no successful build since 2018-04-25
- not used in nixpkgs anymore
2018-09-13 12:28:18 +02:00
Samuel Dionne-Riel
cb380983ed qt5.qtwebkit: Fixes modules src being subtly broken.
b785d4813e introduced breakage in Qt
modules for 5.6 and 5.9, especially visible is Qt Webkit.

This was manifested by having a non-sensical build log where it is using
the top-level `src` attribute as source instead of Qt Webkit's own
source.

Were it not for the `src` top-level attribute (which is a legit
package), the error would have been made obvious by passing `null` to
`src`.

This partily reverts newly introduced way `src` can be passed to a
qtModule, instead relying on extending the `srcs` attrset.

For ZHF #45960
2018-09-08 14:20:23 -04:00
Tom Hall
ec334d38d2 qtwebengine: Fix inputs on aarch64
A mistake in the previous commit meant that ffmpeg wasn't added to the
propagatedBuildInputs on aarch64.
2018-08-26 12:41:54 +01:00
Thomas Tuegel
b74dc6f0f0
Merge pull request #45122 from Thra11/qtwebengine-aarch64
qtwebengine: Use system ffmpeg on aarch64
2018-08-25 07:20:05 -05:00
Tom Hall
e01c61347e qtwebengine: Use system ffmpeg on aarch64
On aarch64, linking against the vendored ffmpeg fails. Including ffmpeg
as a dependency and passing -system-ffmpeg to qmake fixes this.

Slightly odd conditional in qmakeFlags to avoid altering the list on
non-arm platforms, so that the change doesn't trigger an unneccessary
rebuild.
2018-08-24 12:37:57 +01:00
Vladimír Čunát
765d695b89
Merge branch 'staging-next'
Security fixes for a few packages are included.
2018-08-21 15:36:02 +02:00
Matthew Bauer
4826f9b828 qtwebengine: remove old darwin patch
file apparently doesn’t exist anymore
2018-08-20 20:49:25 -05:00
Jan Malakhovski
875b48e3ea qt5.qtwebkit: disable tests 2018-08-11 09:35:36 +00:00
Jan Malakhovski
9cbddc6955 qt5.qtwebkit.hyphen: fix tests 2018-08-11 09:35:19 +00:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Bastian Köcher
b785d4813e qt5: 5.10 -> 5.11
This is the first time since 5.9 that we also update `qtwebkit`.
`qtwebkit` is not maintained by Qt anymore and thus, we switch to the
community port as for example arch has done. To prevent pulling in
single patches, we just stick to the latest git version.
2018-06-12 14:27:11 +02:00
Matthew Justin Bauer
4ae5f8a92a
qt: remove install_name_tool stuff
hopefully it's not needed - the frameworks are no longer there
2018-06-02 23:07:12 -04:00
Matthew Bauer
dcea0913e5 qt: fixup from c4cac55d69
This commit was too aggressive in adding configure flags. Only qtbsea
needs the -no-framework flag to work correctly. Qmake will handle
everything else for us.
2018-06-02 13:50:45 -04:00
Orivej Desh
50c82704a8 qt5.qtlocation: enable parallel building
It was fixed in [1] which is part of 5.9.2, 5.10.0.

[1] 3ac051c454 (diff-b820e0828543b1da522ff0ab3dac6c75)
2018-05-29 13:41:23 +00:00
Thomas Tuegel
db215a62b7
qtwebengine: fix build failure due to -Wformat-security
ninja builds some components with -Wno-format, which is not compatible with the
default hardening setting of -Wformat-security in Nixpkgs.
2018-05-25 20:14:05 -05:00
Will Dietz
39696b6d56 qt-5.10: don't use features that require new-ish kernels, stay compat
Before this change:
$ readelf --notes /nix/store/zf5yja02g8n8dzgs25pqfd8w3myfzgzc-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7778 with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 3.17.0

After:
$ readelf --notes /nix/store/sg1s9hdw0b7p6h0dwg09g4lxy1acq7y6-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7dcc with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 2.6.28

-----------

The above paths were before rebasing the commit onto staging,
and it'd probably be good to have someone confirm the same happens
when built on a hydra builder or other non-dtzWill machine :).

[dezgeg: added comments]
2018-05-18 03:51:20 +03:00
Josef Kemetmüller
472f21951a qt5.qtwebkit: Reduce log size to fix hydra build
This should fix the darwin build of qtwebkit.
2018-05-06 18:44:31 +02:00
Matthew Bauer
ec632b745f qtwebengine: rewrite
Fixes #39334
and Fixes #36729

Also, Fixes #36932 (hopefully it's still building)

(This might be able to be able to be cherry-picked to 18.03 but be
careful - chromium is extremely touchy. Probably best to wait for it
to be built successfully on Hydra a few times.)
2018-04-24 23:57:46 -05:00
Shea Levy
05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Corey O'Connor
807a308623 qtwebengine: correct how NIX_BUILD_CORES is propagated to the gn driven ninja. 2018-03-26 12:32:46 -07:00
Nikolay Amiantov
a5b2e0277a qt5.qtwebengine: fix build 2018-03-26 14:01:49 +03:00
Robin Gloster
8a244db9f3
libsForQt5.qtspeech: enable 2018-03-24 12:07:52 +01:00
Daiderd Jordan
ecbb9027ea
Merge pull request #36847 from badi/qtlocation
qtlocation: fix darwin build
2018-03-14 00:14:53 +01:00
volth
7ec0471242 treewide: s/xlibs/xorg/g (#36889) 2018-03-13 10:16:03 +00:00
John Ericson
dde80d705e qtbase: Fix x86_64-conditional logic
Now works with cross and old and new meta checks alike.
2018-03-12 18:55:41 -04:00
Badi Abdul-Wahid
833851cd6e
qtlocation: fix darwin build
A dependency (boost) makes use of `std::auto_ptr`, which is no longer
supported in C++17 in Clang. This change re-enables `std::auto_ptr`
capabilities.
2018-03-12 02:04:28 -04:00
Alexander V. Nikolaev
e94cd63bf5 treewide: transition libGL/libGLU for qt
Also rename mesaSupported to libGLSupported
2018-02-24 17:06:49 +02:00
Vladimír Čunát
d4f1587da5
qt5*.qtwebkit: disable a warning to fit log on Hydra
Before > 64 MiB, now ~25 MiB.
2018-02-17 09:45:38 +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
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
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
a1b77bfe5f Revert "qt5: 5.9.1 -> 5.9.3"
KDE frameworks 5.40 are not compatible with Qt 5.9.3: #32253

This reverts commit bd71d3aef7 (#32100).
2017-12-02 17:22:17 +00:00
Bastian Köcher
bd71d3aef7 qt5: 5.9.2 -> 5.9.3 2017-12-01 18:34:54 +01:00
Thomas Tuegel
d3efa486e5
qt59.qtbase: carefully avoid applying Linux flags to Darwin build 2017-11-12 09:51:48 -06:00