Merge pull request #36246 from Ma27/solve-keychain-issues-for-intellij

idea: add `libsecret` to the library path
This commit is contained in:
Jörg Thalheim 2018-03-03 18:15:17 +00:00 committed by GitHub
commit e7946b0c8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip
, coreutils, gnugrep, which, git, python, unzip }:
, coreutils, gnugrep, which, git, python, unzip, libsecret
}:
{ name, product, version, src, wmClass, jdk, meta } @ attrs:
@ -65,7 +66,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
--prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
# Some internals want libstdc++.so.6
stdenv.cc.cc.lib
stdenv.cc.cc.lib libsecret
]}" \
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \