commit e945646be3a045948801ff7262bec11a7b9315b3 · pyrox.dev/nixpkgs

+2 -2

pkgs/applications/editors/idea/common.nix

···

       1
       1
        
       { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip

     

       2
       2
       -
       , coreutils, gnugrep, which, git, python, unzip, jdk }:

     

       2
       2
       +
       , coreutils, gnugrep, which, git, python, unzip }:

     

       3
       3
        
       

     

       4
       4
       -
       { name, product, version, build, src, wmClass, meta } @ attrs:

     

       4
       4
       +
       { name, product, version, build, src, wmClass, jdk, meta } @ attrs:

     

       5
       5
        
       

     

       6
       6
        
       with stdenv.lib;

     

       7
       7

+7 -7

pkgs/applications/editors/idea/default.nix

···

       12
       12
        
       

     

       13
       13
        
         buildAndroidStudio = { name, version, build, src, license, description, wmClass }:

     

       14
       14
        
           let drv = (mkIdeaProduct rec {

     

       15
       15
       -
             inherit name version build src wmClass;

     

       15
       15
       +
             inherit name version build src wmClass jdk;

     

       16
       16
        
             product = "Studio";

     

       17
       17
        
             meta = with stdenv.lib; {

     

       18
       18
        
               homepage = https://developer.android.com/sdk/installing/studio.html;

     
···

       38
       38
        
       

     

       39
       39
        
         buildClion = { name, version, build, src, license, description, wmClass }:

     

       40
       40
        
           (mkIdeaProduct rec {

     

       41
       41
       -
             inherit name version build src wmClass;

     

       41
       41
       +
             inherit name version build src wmClass jdk;

     

       42
       42
        
             product = "CLion";

     

       43
       43
        
             meta = with stdenv.lib; {

     

       44
       44
        
               homepage = "https://www.jetbrains.com/clion/";

     
···

       54
       54
        
       

     

       55
       55
        
         buildIdea = { name, version, build, src, license, description, wmClass }:

     

       56
       56
        
           (mkIdeaProduct rec {

     

       57
       57
       -
             inherit name version build src wmClass;

     

       57
       57
       +
             inherit name version build src wmClass jdk;

     

       58
       58
        
             product = "IDEA";

     

       59
       59
        
             meta = with stdenv.lib; {

     

       60
       60
        
               homepage = "https://www.jetbrains.com/idea/";

     
···

       71
       71
        
       

     

       72
       72
        
         buildRubyMine = { name, version, build, src, license, description, wmClass }:

     

       73
       73
        
           (mkIdeaProduct rec {

     

       74
       74
       -
             inherit name version build src wmClass;

     

       74
       74
       +
             inherit name version build src wmClass jdk;

     

       75
       75
        
             product = "RubyMine";

     

       76
       76
        
             meta = with stdenv.lib; {

     

       77
       77
        
               homepage = "https://www.jetbrains.com/ruby/";

     
···

       84
       84
        
       

     

       85
       85
        
         buildPhpStorm = { name, version, build, src, license, description, wmClass }:

     

       86
       86
        
           (mkIdeaProduct {

     

       87
       87
       -
             inherit name version build src wmClass;

     

       87
       87
       +
             inherit name version build src wmClass jdk;

     

       88
       88
        
             product = "PhpStorm";

     

       89
       89
        
             meta = with stdenv.lib; {

     

       90
       90
        
               homepage = "https://www.jetbrains.com/phpstorm/";

     
···

       101
       101
        
       

     

       102
       102
        
         buildWebStorm = { name, version, build, src, license, description, wmClass }:

     

       103
       103
        
           (mkIdeaProduct {

     

       104
       104
       -
             inherit name version build src wmClass;

     

       104
       104
       +
             inherit name version build src wmClass jdk;

     

       105
       105
        
             product = "WebStorm";

     

       106
       106
        
             meta = with stdenv.lib; {

     

       107
       107
        
               homepage = "https://www.jetbrains.com/webstorm/";

     
···

       118
       118
        
       

     

       119
       119
        
         buildPycharm = { name, version, build, src, license, description, wmClass }:

     

       120
       120
        
           (mkIdeaProduct rec {

     

       121
       121
       -
             inherit name version build src wmClass;

     

       121
       121
       +
             inherit name version build src wmClass jdk;

     

       122
       122
        
             product = "PyCharm";

     

       123
       123
        
             meta = with stdenv.lib; {

     

       124
       124
        
               homepage = "https://www.jetbrains.com/pycharm/";