From 058999318ff0d2113a15ae15b50f68a60613171f Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 18 Oct 2024 05:38:39 +0100 Subject: [PATCH] openjfx: format `generic.nix` with `nixfmt-rfc-style` --- .../compilers/openjdk/openjfx/generic.nix | 75 ++++++++++++------- 1 file changed, 48 insertions(+), 27 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/generic.nix b/pkgs/development/compilers/openjdk/openjfx/generic.nix index 70677e247646..94de7c0e575c 100644 --- a/pkgs/development/compilers/openjdk/openjfx/generic.nix +++ b/pkgs/development/compilers/openjdk/openjfx/generic.nix @@ -1,26 +1,27 @@ -{ stdenv -, lib -, pkgs -, fetchFromGitHub -, fetchpatch2 -, writeText -, openjdk23_headless -, gradle -, pkg-config -, perl -, cmake -, gperf -, gtk2 -, gtk3 -, libXtst -, libXxf86vm -, glib -, alsa-lib -, ffmpeg -, python3 -, ruby -, withMedia ? true -, withWebKit ? false +{ + stdenv, + lib, + pkgs, + fetchFromGitHub, + fetchpatch2, + writeText, + openjdk23_headless, + gradle, + pkg-config, + perl, + cmake, + gperf, + gtk2, + gtk3, + libXtst, + libXxf86vm, + glib, + alsa-lib, + ffmpeg, + python3, + ruby, + withMedia ? true, + withWebKit ? false, }: let @@ -31,7 +32,8 @@ let repover = "${major}${update}${build}"; jdk = openjdk23_headless; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { inherit pname; version = "${major}${update}${build}"; @@ -51,8 +53,24 @@ in stdenv.mkDerivation { }) ]; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; - nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; + buildInputs = [ + gtk2 + gtk3 + libXtst + libXxf86vm + glib + alsa-lib + ffmpeg + ]; + nativeBuildInputs = [ + gradle + perl + pkg-config + cmake + gperf + python3 + ruby + ]; dontUseCmakeConfigure = true; @@ -99,7 +117,10 @@ in stdenv.mkDerivation { done ''; - disallowedReferences = [ jdk gradle.jdk ]; + disallowedReferences = [ + jdk + gradle.jdk + ]; meta = with lib; { homepage = "https://openjdk.org/projects/openjfx/";