diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/jetbrains/common.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/jetbrains/common.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/common.nix b/nixpkgs/pkgs/applications/editors/jetbrains/common.nix index 2e244364dc7e..3992fc5c2ec4 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/common.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/common.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText -, coreutils, gnugrep, which, git, unzip, libsecret, libnotify +, coreutils, gnugrep, which, git, unzip, libsecret, libnotify, e2fsprogs , vmopts ? null }: @@ -52,7 +52,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { } interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) - if [ "${stdenv.hostPlatform.system}" == "x86_64-linux" ]; then + if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then target_size=$(get_file_size bin/fsnotifier64) patchelf --set-interpreter "$interpreter" bin/fsnotifier64 munge_size_hack bin/fsnotifier64 $target_size @@ -78,7 +78,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 - stdenv.cc.cc.lib libsecret + stdenv.cc.cc.lib libsecret e2fsprogs libnotify ] ++ extraLdPath)}" \ --set JDK_HOME "$jdk" \ |