Skip to content

Commit

Permalink
Merge pull request NixOS#261136 from Artturin/openjfxcores
Browse files Browse the repository at this point in the history
openjfx: respect NIX_BUILD_CORES in nested cmake
  • Loading branch information
Artturin authored Oct 15, 2023
2 parents 9606c20 + 849e4dc commit 1471dfe
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions pkgs/development/compilers/openjdk/openjfx/11.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ let
buildPhase = ''
runHook preBuild
export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
export GRADLE_USER_HOME=$(mktemp -d)
ln -s $config gradle.properties
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/openjdk/openjfx/15.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ let
buildPhase = ''
runHook preBuild
export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
export GRADLE_USER_HOME=$(mktemp -d)
ln -s $config gradle.properties
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/openjdk/openjfx/17.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ let
buildPhase = ''
runHook preBuild
export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
export GRADLE_USER_HOME=$(mktemp -d)
ln -s $config gradle.properties
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/openjdk/openjfx/19.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ let
buildPhase = ''
runHook preBuild
export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
export GRADLE_USER_HOME=$(mktemp -d)
ln -s $config gradle.properties
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/openjdk/openjfx/20.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ let
buildPhase = ''
runHook preBuild
export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
export GRADLE_USER_HOME=$(mktemp -d)
ln -s $config gradle.properties
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/openjdk/openjfx/21.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ let
buildPhase = ''
runHook preBuild
export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
export GRADLE_USER_HOME=$(mktemp -d)
ln -s $config gradle.properties
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
Expand Down

0 comments on commit 1471dfe

Please sign in to comment.