Commit Graph

72 Commits

Author SHA1 Message Date
Peder Bergebakken Sundt
815143af0f treewide: use lib.splitVersion 2023-12-07 07:18:41 +01:00
Artturin
849e4dc5ff openjfx: respect NIX_BUILD_CORES in nested cmake
Building `openjfx11` or `openjfx12` on a machine with many cores can consume huge amounts of RAM. With 24 cores, the memory usage exceeded `25GB` per build for me.

Using `NIX_BUILD_CORES` to reduce the number of parallel tasks doesn't help, because a script invoking `cmake` does not respect `NIX_BUILD_CORES` and passes `-j <number of cores>`.

Setting `NUMBER_OF_PROCESSORS` overrides the automatic core count detection in the script.

https://github.com/search?q=repo%3Aopenjdk%2Fjfx%20NUMBER_OF_PROCESSORS&type=code

Co-authored-by: Fabian Möller <fabianm88@gmail.com>
2023-10-15 04:56:01 +03:00
Infinidoge
82c294f13a
openjdk21, openjfx21: init at 21 (#258507)
Uses temurin-bin-20 to bootstrap, as temurin-bin-21 hasn't been released yet
2023-10-08 23:11:55 +02:00
sohalt
eacd9ad04d
openjdk: init at 20+36 and openjfx: init at 20+19 2023-07-02 07:52:14 +08:00
Charlotte Van Petegem
cf69135539
openjfx17: fix building with webkit 2023-05-23 15:36:57 +02:00
figsoda
18a6d5d132 openjfx19: add gtk2 2023-03-03 13:57:36 -05:00
figsoda
b434398a50 openjfx17: add gtk2 2023-03-03 13:57:36 -05:00
figsoda
4eaa0c57d9 openjfx11: add gtk2 2023-03-03 13:57:36 -05:00
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin
6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
Thiago Kenji Okada
a41cfc36f5 openjfx19: remove gtk2 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada
1caf19b8e0 openjfx19: add with{Media,Webkit} options 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada
c6323fe258 openjfx17: remove gtk2 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada
d7c4a9bf93 openjfx17: add with{Media,Webkit} options 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada
a76479057a openjfx15: remove gtk2 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada
390227326d openjfx15: add with{Media,Webkit} options 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada
45d339096f openjfx11: remove gtk2 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada
976849f2e6 openjfx11: remove unnecessary NIX_CFLAGS_COMPILE options 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada
640c102321 openjfx11: add with{Media,Webkit} options 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada
0685060feb openjfx19: 19+11 -> 19.0.2.1+1 2023-02-03 18:05:35 +00:00
Thiago Kenji Okada
a8c155e0f6 openjfx17: 17.0.5+1 -> 17.0.6+3 2023-02-03 10:47:29 +00:00
Thiago Kenji Okada
61de80e499 openjfx11: 11.0.17+1 -> 11.0.18+1 2023-02-03 00:09:51 +00:00
Thiago Kenji Okada
2ee1577a1a openjfx15: gradle_5 -> gradle_6 2022-12-13 10:15:29 +00:00
Thiago Kenji Okada
f2cd590cfb openjfx17: 17.0.0.1+1 -> 17.0.5+1 2022-12-13 10:15:07 +00:00
Thiago Kenji Okada
e145132258 openjfx15: mark it as EOL 2022-12-13 10:15:03 +00:00
Thiago Kenji Okada
9e5e9c57bb openjfx11: 11.0.11+1 -> 11.0.17+1 2022-12-13 10:14:37 +00:00
Thiago Kenji Okada
c12732f882 openjfx15: drop i686-linux support
gradle5 does not support i686-linux, so it is impossible to evaluate
this derivation anyway.
2022-12-06 22:39:20 +00:00
Thiago Kenji Okada
b51a1d1f67 openjfx11: 11.0.3+1 -> 11.0.11+1
This updates the Python version needed to build WebKit from 2 to 3,
fixing the previous issue we had.
2022-12-06 22:39:19 +00:00
github-actions[bot]
cb51cfe745
Merge master into staging-next 2022-11-30 18:01:11 +00:00
Matt McHenry
e7cfa26a86 openjdk: init 19.0.1
as usual this is mostly copy-pasted from 18, so this commit is best
reviewed with '--find-copies-harder'

stop exposing openjdk 18 since it was not a long-term support release

change the default openjdk from 17 to 19 since nixpkgs is a
rolling-release repository

drop the ceremony around bootstrapping via adoptopenjdk for 64-bit
builds vs. via earlier openjdk builds for 32-bit, because, to be
frank, since we're using temurin now, it's not a simple copy-paste
job.  :-/  if someone needs a 32-bit openjdk, that work can be done
separately.

JavaFX revs from 17 to 19; it looks like 18 was never packaged along
with JDK 18.

* the gradle invocation used to build JavaFX must still be done with
  Java 18, as gradle does not yet support running itself on Java 19.

* a couple of patches need to be applied, since a new State enum was
  introduced in the JDK that collides with one in JavaFX.

* the hash of the gradle dependencies has not changed, which is
  surprising, but as far as I can tell correct.

One application (libreoffice) doesn't work with 19 yet, so pin it to
jdk 17 for now.

Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
2022-11-22 20:33:24 -05:00
Zane van Iperen
e7bce809ef
openjfx{11,15,17}: use ffmpeg_4-headless
A quick glance at the source shows it only uses libavcodec.
2022-11-08 00:13:24 +10:00
Ivan Kozik
53256fcdb5 openjfx17: use ffmpeg_4
openjfx17's plugins/av/mpegtsdemuxer.c expects ffmpeg 4 and does not build
with ffmpeg 5.1.1.

This change does not result in any rebuilds because nixpkgs `ffmpeg` still
points to `ffmpeg_4`.
2022-09-24 17:20:30 +00:00
Sergei Trofimovich
e9e734bf17 openjfx11, openjfx15: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of
      `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here

openjfx17 is not affected.
2022-06-03 13:48:50 +01:00
Nikolay Amiantov
2eefdb5c7d
Merge pull request #155746 from bachp/openjfx17
openjfx17: init at 17.0.0.1+1
2022-02-17 12:44:51 +03:00
Jonathan Ringer
a47d80b669
openjfk: pin ffmpeg to 4x. 2022-02-06 10:41:06 -08:00
Jonathan Ringer
bca5a4fa6e
openjfx15: pin ffmpeg to 4.x 2022-02-05 12:54:49 -08:00
Pascal Bach
0db6f946fe openjfx17: init at 17.0.0.1+1 2022-01-22 12:21:48 +01:00
Kevin Cox
dc447918a0
Merge pull request #119444 from lorenzleutgeb/gradle-jdk
gradle: Decouple from JDK 8 and support Java Toolchains
2021-11-22 16:27:10 -05:00
Alexander Bantyev
c8f846893c
openjfx11: require-big-parallel 2021-11-19 22:15:35 +03:00
Lorenz Leutgeb
01f4c7ec88 gradle: Decouple gradleGen and JDK 2021-11-19 18:54:25 +01:00
Ryan Burns
554d86af20 openjfx11: fix build
Remove -Werror=implicit-function-declaration, which when passed to cmake
for webkit build breaks C++ compiler configuration due to spurious warnings:
`cc1plus: warning: '-Werror=' argument '-Werror=implicit-function-declaration' is not valid for C++`
2021-09-10 21:38:30 +09:00
Frederik Rietdijk
196d3b8291 openjfx11: stay with python2 2021-07-27 20:37:06 +02:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Robert Schütz
d2f2e638a9
openjfx11: use ffmpeg instead of ffmpeg_3 (#123500) 2021-05-19 23:35:43 +02:00
regnat
de2afd359d openjfx: Fix for CA derivations
Manipulating the store paths on the Nix side doesn’t work with CA
derivations (because these paths are just placeholders of the form
`/{hash}` at eval-time)
2021-05-03 18:01:02 +02:00
ajs124
fa8551634e openjfx15: python2 -> python3, ffmpeg_3 -> ffmpeg 2021-03-03 02:50:48 +01:00
Fabian Möller
65525be83b
openjfx15: enable i686-linux build 2021-01-26 20:26:28 +01:00
Ben Siraphob
acc5f7b18a pkgs/development/compilers: stdenv.lib -> lib 2021-01-23 08:57:37 +07: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