mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 23:52:33 +00:00
Merge pull request #15238 from binarin/keepass-gtk-warning
keepass: fix warning about missing GTK
This commit is contained in:
commit
c7c08ced11
|
@ -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" \
|
||||
|
|
Loading…
Reference in a new issue