From 73a279f24a841b37954e3ad620efb1594c5e69aa Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sun, 24 Nov 2024 14:15:11 +0100 Subject: [PATCH] shell.nix: docs --- jabref/shell.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jabref/shell.nix b/jabref/shell.nix index e7ac3551..b55725f0 100644 --- a/jabref/shell.nix +++ b/jabref/shell.nix @@ -1,6 +1,3 @@ -# Gradle's toolchain support does not work with IntelliJ, thus we have to use buildFHSUserEnv - -# https://discourse.nixos.org/t/how-to-create-a-development-environment-with-intellij-idea-and-openjdk/10153 { pkgs ? import { # https://github.com/NixOS/nixpkgs/issues/166220#issuecomment-1745803058 @@ -11,15 +8,18 @@ let unstable = import (fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz) { }; + # https://github.com/NixOS/nixpkgs/blob/4b218e54ae22c8b3ad642ff0dec842363c3abd0f/pkgs/top-level/all-packages.nix#L14583-L14588 jdk = unstable.jdk23.override { enableJavaFX = true; openjfx_jdk = unstable.openjfx23.override { withWebKit = true; }; }; + # https://github.com/NixOS/nixpkgs/blob/23e89b7da85c3640bbc2173fe04f4bd114342367/pkgs/development/tools/build-managers/gradle/default.nix#L46 gradle = unstable.gradle.override { java = jdk; }; in ( + # Gradle's toolchain support does not work with IntelliJ, thus we have to use buildFHSUserEnv pkgs.buildFHSUserEnv { name = "intellij-gradle-jdk23";