public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #135074 from NixOS/backport-134616-to-release-21.05

Browse Source 
[Backport release-21.05] Fix Jetbrains on NixOS: Add e2fsprogs
This commit is contained in:
Maciej Krüger
2021-08-21 16:26:52 +02:00
committed by GitHub
parent 219a77ea26 9295a53afc
commit d3fbdb26a2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/jetbrains/common.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText { stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify , coreutils, gnugrep, which, git, unzip, libsecret, libnotify, e2fsprogs
, vmopts ? null , 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 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 ([ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
# Some internals want libstdc++.so.6 # Some internals want libstdc++.so.6
stdenv.cc.cc.lib libsecret stdenv.cc.cc.lib libsecret e2fsprogs
libnotify libnotify
] ++ extraLdPath)}" \ ] ++ extraLdPath)}" \
--set JDK_HOME "$jdk" \ --set JDK_HOME "$jdk" \