Unverified Commit d535e284 authored by ners's avatar ners
Browse files

jetbrains.*: add missing build inputs

parent 498f5254

pkgs/applications/editors/jetbrains/default.nix

+9 −19
Original line number Diff line number Diff line
@@ -83,15 +83,22 @@ let 
    mkJetBrainsProductCore {

      inherit

        pname

        extraLdPath

        jdk

        extraBuildInputs

        ;

      extraBuildInputs =

        extraBuildInputs

        ++ [ stdenv.cc.cc ]

        ++ lib.optionals stdenv.hostPlatform.isLinux [

          fontconfig

          libGL

          libX11

        ];

      extraWrapperArgs =

        extraWrapperArgs

        ++ lib.optionals (stdenv.hostPlatform.isLinux && forceWayland) [

          ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"''

        ];

      extraLdPath = extraLdPath ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL ];

      src =

        if fromSource then

          communitySources."${pname}"
@@ -179,7 +186,6 @@ rec { 
  aqua = mkJetBrainsProduct {

    pname = "aqua";

    extraBuildInputs = [

      stdenv.cc.cc

      lldb

    ];

  };
@@ -189,9 +195,7 @@ rec { 
      pname = "clion";

      extraBuildInputs =

        lib.optionals stdenv.hostPlatform.isLinux [

          fontconfig

          python3

          stdenv.cc.cc

          openssl

          libxcrypt-legacy

          lttng-ust_2_12
@@ -221,7 +225,6 @@ rec { 


  datagrip = mkJetBrainsProduct {

    pname = "datagrip";

    extraBuildInputs = [ stdenv.cc.cc ];

  };



  dataspell =
@@ -236,7 +239,6 @@ rec { 
      extraBuildInputs = [

        libgcc

        libr

        stdenv.cc.cc

      ];

    };
@@ -254,7 +256,6 @@ rec { 
      ];

      extraBuildInputs = [

        libgcc

        stdenv.cc.cc

      ];

    }).overrideAttrs

      (attrs: {
@@ -269,12 +270,10 @@ rec { 


  idea-community-bin = buildIdea {

    pname = "idea-community";

    extraBuildInputs = [ stdenv.cc.cc ];

  };



  idea-community-src = buildIdea {

    pname = "idea-community";

    extraBuildInputs = [ stdenv.cc.cc ];

    fromSource = true;

  };
@@ -287,7 +286,6 @@ rec { 
  idea-ultimate = buildIdea {

    pname = "idea-ultimate";

    extraBuildInputs = [

      stdenv.cc.cc

      lldb

      musl

    ];
@@ -298,7 +296,6 @@ rec { 
  phpstorm = mkJetBrainsProduct {

    pname = "phpstorm";

    extraBuildInputs = [

      stdenv.cc.cc

      musl

    ];

  };
@@ -322,8 +319,6 @@ rec { 
    (mkJetBrainsProduct {

      pname = "rider";

      extraBuildInputs = [

        fontconfig

        stdenv.cc.cc

        openssl

        libxcrypt

        lttng-ust_2_12
@@ -357,7 +352,6 @@ rec { 
  ruby-mine = mkJetBrainsProduct {

    pname = "ruby-mine";

    extraBuildInputs = [

      stdenv.cc.cc

      musl

    ];

  };
@@ -370,8 +364,6 @@ rec { 
          python3

          openssl

          libxcrypt-legacy

          fontconfig

          xorg.libX11

        ]

        ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [

          expat
@@ -389,7 +381,6 @@ rec { 
  webstorm = mkJetBrainsProduct {

    pname = "webstorm";

    extraBuildInputs = [

      stdenv.cc.cc

      musl

    ];

  };
@@ -397,7 +388,6 @@ rec { 
  writerside = mkJetBrainsProduct {

    pname = "writerside";

    extraBuildInputs = [

      stdenv.cc.cc

      musl

    ];

  };