diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-05-05 19:14:05 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-05-05 19:14:05 +0100 |
| commit | c7c08ced114b784c4c367a9873bdc01c13cdf8ca (patch) | |
| tree | 41ca9652370586b6991c950c7f8d8ebe867ca415 /pkgs | |
| parent | 246d54ab618617658e44154295dc8dd13ee0ff3c (diff) | |
| parent | d625c7ee3f657af3b3ab87b2a7d53a1cace5d74a (diff) | |
| download | nixlib-c7c08ced114b784c4c367a9873bdc01c13cdf8ca.tar nixlib-c7c08ced114b784c4c367a9873bdc01c13cdf8ca.tar.gz nixlib-c7c08ced114b784c4c367a9873bdc01c13cdf8ca.tar.bz2 nixlib-c7c08ced114b784c4c367a9873bdc01c13cdf8ca.tar.lz nixlib-c7c08ced114b784c4c367a9873bdc01c13cdf8ca.tar.xz nixlib-c7c08ced114b784c4c367a9873bdc01c13cdf8ca.tar.zst nixlib-c7c08ced114b784c4c367a9873bdc01c13cdf8ca.zip | |
Merge pull request #15238 from binarin/keepass-gtk-warning
keepass: fix warning about missing GTK
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/keepass/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index d6835388d89e..29d434c53af0 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, plugins ? [] }: +{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, gtk2, plugins ? [] }: # KeePass looks for plugins in under directory in which KeePass.exe is # located. It follows symlinks where looking for that directory, so @@ -72,6 +72,8 @@ with builtins; buildDotnetPackage rec { # is found and does not pollute output path. binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins)); + dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ]; + postInstall = let extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh; @@ -79,7 +81,9 @@ with builtins; buildDotnetPackage rec { '' mkdir -p "$out/share/applications" cp ${desktopItem}/share/applications/* $out/share/applications - wrapProgram $out/bin/keepass --prefix PATH : "$binPaths" + wrapProgram $out/bin/keepass \ + --prefix PATH : "$binPaths" \ + --prefix LD_LIBRARY_PATH : "$dynlibPath" ${extractFDeskIcons} \ "./Translation/TrlUtil/Resources/KeePass.ico" \ |