summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Beeres <yuuki@protonmail.com>2021-08-18 09:50:45 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-08-21 12:36:34 +0000
commit9295a53afc2db8f801b43dbcd1355660d776ee35 (patch)
tree57d02d70b3b108e8abe72ce93475a860d42c451a
parentMerge branch 'staging-21.05' into release-21.05 (diff)
downloadnixpkgs-9295a53afc2db8f801b43dbcd1355660d776ee35.tar.gz
Add e2fsprogs to jetbrains
Without this dependency JetBrains editors, on NixOS, will throw errors about a missing object file: java.lang.UnsatisfiedLinkError: libe2p.so (cherry picked from commit 70f3763e146432eca9cf7d792e7d2d12684e1c5f)
-rw-r--r--pkgs/applications/editors/jetbrains/common.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 0b5810d928cf..872218363ad2 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/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
}:
@@ -74,7 +74,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" \