Unverified Commit 80400285 authored by Michael Daniels's avatar Michael Daniels Committed by GitHub
Browse files

jetbrains.idea,phpstorm,pycharm,rider,ruby-mine,webstorm: fix buildInputs on darwin (#488283)

parents 0d3ea6c6 ab99f701

pkgs/applications/editors/jetbrains/ides/idea.nix

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ mkJetBrainsProduct { 
    ''--set M2 "${maven}/maven/bin"''

  ];



  buildInputs = [

  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [

    lldb

    musl

  ];

pkgs/applications/editors/jetbrains/ides/phpstorm.nix

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ mkJetBrainsProduct { 


  src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));



  buildInputs = [

  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [

    musl

  ];

pkgs/applications/editors/jetbrains/ides/pycharm.nix

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ in 


  src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));



  buildInputs = [

  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [

    musl

  ];

pkgs/applications/editors/jetbrains/ides/rider.nix

+15 −14
Original line number Diff line number Diff line
@@ -57,13 +57,14 @@ in 


  src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));



  buildInputs = [

  # TODO: Some of these dependencies should probably also be added on Darwin - however it seems that JetBrains bundles them all? Unclear.

  #       Somebody with a Darwin machine should investigate this.

  buildInputs =

    lib.optionals stdenv.hostPlatform.isLinux [

      openssl

      libxcrypt

      lttng-ust_2_12

      musl

  ]

  ++ lib.optionals stdenv.hostPlatform.isLinux [

      libxcb-keysyms

    ]

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

pkgs/applications/editors/jetbrains/ides/ruby-mine.nix

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ mkJetBrainsProduct { 


  src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));



  buildInputs = [

  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [

    musl

  ];