From cc733c14dd34cf9c67f2d12ca898083d002efad7 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 9 Oct 2021 23:20:30 +0200 Subject: [PATCH] jetbrains.idea: add m2_home and m2 variable --- pkgs/applications/editors/jetbrains/common.nix | 3 ++- pkgs/applications/editors/jetbrains/default.nix | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 3992fc5c2ec4..9356a66f2764 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -3,7 +3,7 @@ , vmopts ? null }: -{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }@args: +{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: with lib; @@ -81,6 +81,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { stdenv.cc.cc.lib libsecret e2fsprogs libnotify ] ++ extraLdPath)}" \ + ${lib.concatStringsSep " " extraWrapperArgs} \ --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \ diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index db2d36e338f7..631c2e1a55d9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, callPackage, fetchurl , jdk, cmake, zlib, python3 , dotnet-sdk_5 +, maven , autoPatchelfHook , libdbusmenu , vmopts ? null @@ -98,6 +99,10 @@ let inherit name version src wmClass jdk; product = "IDEA"; extraLdPath = [ zlib ]; + extraWrapperArgs = [ + ''--set M2_HOME "${maven}/maven"'' + ''--set M2 "${maven}/maven/bin"'' + ]; meta = with lib; { homepage = "https://www.jetbrains.com/idea/"; inherit description license;