Commit graph

40 commits

Author SHA1 Message Date
John Ericson 9c213398b3 lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e634.
2021-01-23 10:01:28 -05:00
Jonathan Ringer 0bc275e634
Revert "lib: Clean up how linux and gcc config is specified"
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
2021-01-22 14:07:06 -08:00
John Ericson 8929989614 lib: Clean up how linux and gcc config is specified
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
2021-01-21 22:44:09 -05:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Dmitry Kalinkin ee2501f124
qt5.qtwebengine: don't override patches in qtModule
This fixes darwin build.

Fixes: 90db9641 ('qt5.qtwebengine: fix build with bison-3.7')
2020-11-09 21:11:59 -05:00
Dmitry Kalinkin aa08b8eb73
qt5.qtwebengine: remove dead conditions for pre 5.12 support
This doesn't change the derivation.
2020-11-09 15:36:08 -05:00
Frederik Rietdijk 081bd762e5 Merge staging-next into staging 2020-08-26 08:43:29 +02:00
Fabian Möller 90db9641cb
qt5.qtwebengine: fix build with bison-3.7 (#96295) 2020-08-25 20:13:45 +02:00
Florian Klink 40d2968ebf
Merge pull request #94354 from flokli/systemd-246
systemd: 245.6 -> 246
2020-08-24 12:42:24 +02:00
Ruben Maher 68bf9101d7
qtwebengine: fix build for darwin 2020-08-19 21:57:45 +09:00
Florian Klink 77a9788b08 qt5.qtwebengine: use lib.getLib systemd instead of systemd.lib
This will pick the `lib` output if it exists, otherwise default to `out`.
2020-08-13 20:51:40 +02:00
Doron Behar 01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Dima 3bfe0872b9 qt5.{qtwebengine, qtwebkit}: fix -Wno-class-memaccess warning for clang
With a previous fix for log size issues due to GCC 8
a gcc specific `-W` flag was added that clang does
not know, so it spams the logs.
2019-10-07 04:12:26 +02:00
worldofpeace f21f980ab8 qt5.qtwebengine: reduce log output
Identical fix as 6f1ad0676f.
2019-09-15 19:20:45 -04:00
Robin Gloster 3dede565c7
qt56: remove; unused, broken with openssl 1.1 2019-08-22 14:50:28 +02:00
Daiderd Jordan cbfbe9ca1e
qt: remove cf-private 2019-07-03 22:20:16 +02:00
Matthew Bauer c4fc74b19c qtwebengine: don’t use gn configure
qtwebengine has its own configure script, so don’t try to use gn.
2019-06-03 21:42:59 -04:00
Frederik Rietdijk 0196d8f11c Merge master into staging-next 2019-05-07 09:00:06 +02:00
volth 5ad79dc4bb compilation for particular x86_64 architecture 2019-04-30 14:28:04 +00:00
Matthew Bauer 0fe315c9b6 treewide: remove old patches for macOS
These shouldn’t be needed now that we are on macOS 10.12.
2019-04-26 21:54:32 -04:00
Dmitry Kalinkin 0624deb5df
qt59.qtwebengine: fix on darwin
This ports a patch that is already used in 5.11. Also one of the
substituteInPlace call fails because a file doesn't exist.
2019-03-26 16:30:58 -04:00
Dmitry Kalinkin ccd1bf610d
qt5.qtwebengine: refactor more things to use patches instead of substituteInPlace
qt59.qtwebengine doesn't need those fixes (probably since the recent
minor version bump)
2019-03-26 16:30:58 -04:00
Dmitry Kalinkin 1809832958
qt5.qtwebengine: disable platform check using patches
The previous code using substituteInPlace was broken for both 5.9 and
5.11 (latter was broken after a minor release bump). Using patches
should make things fail loudly and prevent modules/qtwebengine.nix from
being littered with version checks.

The patch for 5.12 is only tested to apply.
2019-03-26 16:30:50 -04:00
Dmitry Kalinkin 56dcf6e1f6
qt5.qtwebengine: refactor to use lib.versionOlder 2019-01-27 19:01:17 -05:00
Dmitry Kalinkin ecbb9d3639
qt5.qtwebengine: don't propagate cups dependency 2019-01-20 14:57:59 -05:00
Dmitry Kalinkin 45ab55e6e2
qt511.qtwebengine: fix build on darwin
Co-Authored-By: Josef Kemetmüller <josef.kemetmueller@gmail.com>
2019-01-12 16:40:06 -05:00
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
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
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
Matthew Bauer 4826f9b828 qtwebengine: remove old darwin patch
file apparently doesn’t exist anymore
2018-08-20 20:49:25 -05: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
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
volth 7ec0471242 treewide: s/xlibs/xorg/g (#36889) 2018-03-13 10:16:03 +00: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
Renamed from pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix (Browse further)