BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15238 from binarin/keepass-gtk-warning

Browse source 
keepass: fix warning about missing GTK
This commit is contained in:
zimbatm 2016-05-05 19:14:05 +01:00
commit c7c08ced11
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/misc/keepass/default.nix
View file

@ -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 # KeePass looks for plugins in under directory in which KeePass.exe is
# located. It follows symlinks where looking for that directory, so # 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. # is found and does not pollute output path.
binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins)); binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins));
dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ];
postInstall = postInstall =
let let
extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh; extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh;
@ -79,7 +81,9 @@ with builtins; buildDotnetPackage rec {
'' ''
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"
cp ${desktopItem}/share/applications/* $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} \ ${extractFDeskIcons} \
"./Translation/TrlUtil/Resources/KeePass.ico" \ "./Translation/TrlUtil/Resources/KeePass.ico" \