Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ee735ff1f95a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e7946b0c8f25
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 3, 2018

  1. idea: add libsecret to the library path 

    This solves the `Cannot access native keychain` warning from
IntelliJ-based IDEs. Previously IDEA was unable to find `libsecret` as
it was not part of its library path.

Please keep in mind that the keyring daemon that can be enabled on
NixOS with `services.gnome3.gnome-keyring.enable = true` must be
running.
    @Ma27
    Ma27 committed Mar 3, 2018
    Copy the full SHA
    a38466a View commit details

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

    idea: add `libsecret` to the library path
    @Mic92
    Mic92 authored Mar 3, 2018
    Copy the full SHA
    e7946b0 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/applications/editors/jetbrains/common.nix
5 changes: 3 additions & 2 deletions pkgs/applications/editors/jetbrains/common.nix
View file
Original file line number Diff line number Diff line change
@@ -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" \