JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #141142 from rhoriguchi/pkgs.jetbrains.idea-ultimate

Browse Source
This commit is contained in:
Sandro 2021-12-16 13:13:57 +01:00 committed by GitHub
commit e58509cef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/jetbrains/common.nix
View File

@ -3,7 +3,7 @@
, vmopts ? null , vmopts ? null
}: }:
{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }@args: { name, product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args:
with lib; with lib;
@ -81,6 +81,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
stdenv.cc.cc.lib libsecret e2fsprogs stdenv.cc.cc.lib libsecret e2fsprogs
libnotify libnotify
] ++ extraLdPath)}" \ ] ++ extraLdPath)}" \
${lib.concatStringsSep " " extraWrapperArgs} \
--set JDK_HOME "$jdk" \ --set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \ --set ${hiName}_JDK "$jdk" \
--set ANDROID_JAVA_HOME "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \

5
pkgs/applications/editors/jetbrains/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, callPackage, fetchurl { lib, stdenv, callPackage, fetchurl
, jdk, cmake, zlib, python3 , jdk, cmake, zlib, python3
, dotnet-sdk_5 , dotnet-sdk_5
, maven
, autoPatchelfHook , autoPatchelfHook
, libdbusmenu , libdbusmenu
, vmopts ? null , vmopts ? null
@ -98,6 +99,10 @@ let
inherit name version src wmClass jdk; inherit name version src wmClass jdk;
product = "IDEA"; product = "IDEA";
extraLdPath = [ zlib ]; extraLdPath = [ zlib ];
extraWrapperArgs = [
''--set M2_HOME "${maven}/maven"''
''--set M2 "${maven}/maven/bin"''
];
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/idea/"; homepage = "https://www.jetbrains.com/idea/";
inherit description license; inherit description license;