diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-09-25 19:31:32 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-09-25 19:31:32 -0400 |
| commit | b3472597b74e5442a9b810d7a683f69be6539139 (patch) | |
| tree | e25fb3319f0a21cfe1330ae235b898776110f73e /pkgs/applications/editors | |
| parent | fe5a295a229c791f079f5d83f4d59c409a0e5b90 (diff) | |
| parent | c455adcc42f9b2b62376b9fee99a0c5004a52425 (diff) | |
| download | nixlib-b3472597b74e5442a9b810d7a683f69be6539139.tar nixlib-b3472597b74e5442a9b810d7a683f69be6539139.tar.gz nixlib-b3472597b74e5442a9b810d7a683f69be6539139.tar.bz2 nixlib-b3472597b74e5442a9b810d7a683f69be6539139.tar.lz nixlib-b3472597b74e5442a9b810d7a683f69be6539139.tar.xz nixlib-b3472597b74e5442a9b810d7a683f69be6539139.tar.zst nixlib-b3472597b74e5442a9b810d7a683f69be6539139.zip | |
Merge branch 'staging-next' into staging
Fixes eval on darwin after #69072 Tested using maintainers/scripts/eval-release.sh before and after to see that the fix works
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/jetbrains/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 16a1c01363d8..ebdfb09936aa 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -201,11 +201,11 @@ let platforms = platforms.linux; }; }) (attrs: { - patchPhase = attrs.patchPhase + '' + patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' # Patch built-in mono for ReSharperHost to start successfully interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen - ''; + ''); }); buildRubyMine = { name, version, src, license, description, wmClass, ... }: |